From 011be2c316ae87fa02efaffc14b05663cb989848 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 13 Nov 2005 11:22:03 +0000 Subject: tweak marking of D as readonly since we need to play around with it in pkg_preinst svn path=/main/trunk/; revision=2302 --- bin/ebuild.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/ebuild.sh b/bin/ebuild.sh index be4486182..8b0d5e9ba 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1236,7 +1236,8 @@ dyn_preinst() { [ "$(type -t pre_pkg_preinst)" == "function" ] && pre_pkg_preinst - D=${IMAGE} pkg_preinst + declare -r D=${IMAGE} + pkg_preinst # hopefully this will someday allow us to get rid of the no* feature flags # we don't want globbing for initial expansion, but afterwards, we do @@ -1765,9 +1766,11 @@ export S=${WORKDIR}/${P} unset E_IUSE E_DEPEND E_RDEPEND E_CDEPEND E_PDEPEND -for x in T P PN PV PVR PR A D EBUILD EMERGE_FROM O PPID FILESDIR PORTAGE_TMPDIR; do +for x in T P PN PV PVR PR A EBUILD EMERGE_FROM O PPID FILESDIR PORTAGE_TMPDIR; do [[ ${!x-UNSET_VAR} != UNSET_VAR ]] && declare -r ${x} done +# Need to be able to change D in dyn_preinst due to the IMAGE stuff +[[ $* != "preinst" ]] && declare -r D unset x # Turn of extended glob matching so that g++ doesn't get incorrectly matched. -- cgit v1.2.3-1-g7c22