From 4e3d0e115d00d29ad1c5bc006a5f579ac758f2e5 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sun, 30 Mar 2008 21:47:23 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ targets/support/kmerge.sh | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 110edb9b..4e41aa87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 30 Mar 2008; Andrew Gaffney + 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 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 702203a9..ed7030b9 100755 --- 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 -- 2.26.2