From: Andrew Gaffney Date: Sun, 30 Mar 2008 22:27:49 +0000 (+0000) Subject: Run sed on KERNELVERSION to escape the slashes so we can use it in another sed X-Git-Tag: CATALYST_2_0_6_916~110 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7e74a1d385ea2655321adac12cd0b4e9abac4d85;p=catalyst.git 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 4e41aa87..2a1eaf36 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: + Run sed on KERNELVERSION to escape the slashes so we can use it in another + sed + 30 Mar 2008; Andrew Gaffney 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 ed7030b9..16226a69 100755 --- 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