From 611f864053f876546bd07847e459a8de55fd1807 Mon Sep 17 00:00:00 2001
From: Andrew Gaffney <agaffney@gentoo.org>
Date: Thu, 4 Sep 2008 01:54:15 +0000
Subject: [PATCH] Add code to modify copied specs and create snapshot

svn path=/trunk/; revision=565
---
 tools/ChangeLog     |  3 +++
 tools/catalyst-auto | 25 +++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/tools/ChangeLog b/tools/ChangeLog
index 67539326..bdb06a4a 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  04 Sep 2008; Andrew Gaffney <agaffney@gentoo.org> catalyst-auto:
+  Add code to modify copied specs and create snapshot
+
   04 Sep 2008; Andrew Gaffney <agaffney@gentoo.org> +catalyst-auto,
   +catalyst-auto.conf:
   Initial commit of catalyst-auto script
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 462c3e7d..061e439b 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -36,9 +36,10 @@ run_cmd() {
   logfile=$2
 
   if [ $verbose = 1 ]; then
-    ${cmd} 2>&1 | tee ${logfile}
+    echo "*** Running command: ${cmd}"
+#    ${cmd} 2>&1 | tee ${logfile}
   else
-    ${cmd} &> ${logfile}
+#    ${cmd} &> ${logfile}
   fi
 }
 
@@ -113,6 +114,26 @@ done
 
 cd ${TMPDIR}/specs
 
+DATESTAMP=$(date +%Y%m%d)
+
+# Fix up specs with datestamp
+for i in $(find -name '*.spec'); do
+  # Grab current version_stamp and source_subpath
+  old_version_stamp=$(grep version_stamp ${i} | sed -e 's|^version_stamp: *||')
+  old_source_subpath=$(grep source_subpath ${i} | sed -e 's|^source_subpath: .\+-||')
+
+  sed -i 's|^version_stamp:.*$|version_stamp: '${DATESTAMP}'|' ${i}
+  sed -i 's|^snapshot:.*$|snapshot: '${DATESTAMP}'|' ${i}
+  if [ "${old_version_stamp}" = "${old_source_subpath}" ]; then
+    sed -i 's|^source_subpath: (.\+-).\+$|source_subpath: \1'${DATESTAMP}'|'
+  fi
+done
+
+# Create snapshot
+if ! run_cmd "catalyst -c ${CATALYST_CONFIG} -s ${DATESTAMP}" ${TMPDIR}/log/snapshot-${DATESTAMP}.log"; then
+  send_email "Catalyst build error - snapshot" "$(tail -n 200 ${TMPDIR}/log/snapshot-${DATESTAMP}.log)"
+fi
+
 for i in $(ls -1 ${SPECS}); do
   LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
   run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}