Modify test to run if package.provided exists instead of if it doesn't

Run sed on the correct file

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

diff --git a/ChangeLog b/ChangeLog
index 110edb9bbdf5958e21bd57c4898daa508ff102d0..4e41aa8745ba28c71ac56aa659ab4005b6643401 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:
+  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@gentoo.org> catalyst,
   targets/support/chroot-functions.sh:
   Added --noreplace to setup_myfeatures merges so we don't blow away any

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 702203a9a57055c661d0d1b08f4c9563da28eb9a..ed7030b981a7d9e15f12aba481c928da141f3c71 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -196,7 +196,7 @@ then
                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 @@ echo ${clst_kernel_use} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_vers
 
 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