Run sed on KERNELVERSION to escape the slashes so we can use it in another sed

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1384 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 4e41aa8745ba28c71ac56aa659ab4005b6643401..2a1eaf3658c75c09bec4325fb3dfb1cfcb712839 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  30 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
+  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@gentoo.org>
   targets/support/kmerge.sh:
   Modify test to run if package.provided exists instead of if it doesn't Run

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index ed7030b981a7d9e15f12aba481c928da141f3c71..16226a6994704d8eeda7cc93c028e3b8f45e0c9f 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -242,6 +242,6 @@ if [ -n "${clst_KERNCACHE}" ]
 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