[gentoo-commits] releng r589 - trunk/tools

[Andrew Gaffney (agaffney)]

Author: agaffney
Date: 2008-11-05 01:47:53 +0000 (Wed, 05 Nov 2008)
New Revision: 589

Modified:
   trunk/tools/ChangeLog
   trunk/tools/catalyst-auto
Log:
Make sure we don't mangle the source_subpath on our stage1 spec

Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog	2008-11-05 01:41:26 UTC (rev 588)
+++ trunk/tools/ChangeLog	2008-11-05 01:47:53 UTC (rev 589)
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  05 Nov 2008; Andrew Gaffney <agaffney@g.o> catalyst-auto:
+  Make sure we don't mangle the source_subpath on our stage1 spec
+
   31 Oct 2008; Andrew Gaffney <agaffney@g.o> catalyst-auto-x86.conf:
   Add in x86 stage2/3 for minimal CD
 

Modified: trunk/tools/catalyst-auto
===================================================================
--- trunk/tools/catalyst-auto	2008-11-05 01:41:26 UTC (rev 588)
+++ trunk/tools/catalyst-auto	2008-11-05 01:47:53 UTC (rev 589)
@@ -149,9 +149,12 @@
 
   sed -i 's|^version_stamp:.*$|version_stamp: '${DATESTAMP}'|' ${i}
   sed -i 's|^snapshot:.*$|snapshot: '${DATESTAMP}'|' ${i}
-  if [ "${old_version_stamp}" = "${old_source_subpath}" ]; then
+
+  # We don't want to mangle the source_subpath for our stage1 spec
+  if ! grep -q '^target: *stage1$' ${i}; then
     sed -i 's|^source_subpath: \(.\+-\).\+$|source_subpath: \1'${DATESTAMP}'|' ${i}
   fi
+
   sed -i '/^livecd\/iso/s|'${old_version_stamp}'|'${DATESTAMP}'|' ${i}
 
   kconfig_line=$(grep '^boot/kernel/[^/]\+/config:' ${i})