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

[Andrew Gaffney (agaffney)]

Author: agaffney
Date: 2008-03-30 22:27:49 +0000 (Sun, 30 Mar 2008)
New Revision: 1384

Modified:
   trunk/ChangeLog
   trunk/targets/support/kmerge.sh
Log:
Run sed on KERNELVERSION to escape the slashes so we can use it in another sed

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-30 21:47:23 UTC (rev 1383)
+++ trunk/ChangeLog	2008-03-30 22:27:49 UTC (rev 1384)
@@ -3,6 +3,11 @@
 
   30 Mar 2008; Andrew Gaffney <agaffney@g.o>
   targets/support/kmerge.sh:
+  Run sed on KERNELVERSION to escape the slashes so we can use it in another
+  sed
+
+  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
 

Modified: trunk/targets/support/kmerge.sh
===================================================================
--- trunk/targets/support/kmerge.sh	2008-03-30 21:47:23 UTC (rev 1383)
+++ trunk/targets/support/kmerge.sh	2008-03-30 22:27:49 UTC (rev 1384)
@@ -242,6 +242,6 @@
 then
 	if [ -e /etc/portage/profile/package.provided ]
 	then
-		sed -i "/^${KERNELVERSION}\$/d" /etc/portage/profile/package.provided
+		sed -i "/^$(echo "${KERNELVERSION}" | sed -e 's|/|\\/|g')\$/d" /etc/portage/profile/package.provided
 	fi
 fi

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