[gentoo-commits] catalyst r1383 - in trunk: . targets/support

[Andrew Gaffney (agaffney)]

Author: agaffney
Date: 2008-03-30 21:47:23 +0000 (Sun, 30 Mar 2008)
New Revision: 1383

Modified:
   trunk/ChangeLog
   trunk/targets/support/kmerge.sh
Log:
Modify test to run if package.provided exists instead of if it doesn't
Run sed on the correct file

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-27 04:58:57 UTC (rev 1382)
+++ trunk/ChangeLog	2008-03-30 21:47:23 UTC (rev 1383)
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  30 Mar 2008; Andrew Gaffney <agaffney@g.o>
+  targets/support/kmerge.sh:
+  Modify test to run if package.provided exists instead of if it doesn't Run
+  sed on the correct file
+
   27 Mar 2008; Chris Gianelloni <wolf31o2@g.o> catalyst,
   targets/support/chroot-functions.sh:
   Added --noreplace to setup_myfeatures merges so we don't blow away any

Modified: trunk/targets/support/kmerge.sh
===================================================================
--- trunk/targets/support/kmerge.sh	2008-03-27 04:58:57 UTC (rev 1382)
+++ trunk/targets/support/kmerge.sh	2008-03-30 21:47:23 UTC (rev 1383)
@@ -196,7 +196,7 @@
 		mkdir -p /etc/portage/profile
 		echo "${KERNELVERSION}" > /etc/portage/profile/package.provided
 	else
-		if ( ! grep -q "^${KERNELVERSION}"  /etc/portage/profile/package.provided ) 
+		if ( ! grep -q "^${KERNELVERSION}\$"  /etc/portage/profile/package.provided ) 
 		then
 			echo "${KERNELVERSION}" >> /etc/portage/profile/package.provided
 		fi
@@ -240,8 +240,8 @@
 
 if [ -n "${clst_KERNCACHE}" ]
 then
-	if [ ! -e /etc/portage/profile/package.provided ]
+	if [ -e /etc/portage/profile/package.provided ]
 	then
-		sed -i "/^${KERNELVERSION}\$/d" /etc/portage/package.provided
+		sed -i "/^${KERNELVERSION}\$/d" /etc/portage/profile/package.provided
 	fi
 fi

-- 
gentoo-commits@l.g.o mailing list