diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-20 23:54:19 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-20 23:54:19 +0000 |
| commit | 1c991a8ccd83c97ec6b37ca70453b11dc781e2ff (patch) | |
| tree | dd9e945b4b51d9784dc2f879c50bc9331cff2284 /bin/ebuild.sh | |
| parent | 5dc1ddb6bdb0a1f128b04bdebc981f611cec671f (diff) | |
| download | portage-1c991a8ccd83c97ec6b37ca70453b11dc781e2ff.tar.gz portage-1c991a8ccd83c97ec6b37ca70453b11dc781e2ff.tar.bz2 portage-1c991a8ccd83c97ec6b37ca70453b11dc781e2ff.zip | |
* Replace references to deprecated ${IMAGE} with equivalent ${D}.
* Remove redundant trailing slashes and fix quoting.
(trunk r8501)
svn path=/main/branches/2.1.2/; revision=8560
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 0a6694ce2..767d3f307 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1150,14 +1150,13 @@ dyn_install() { } dyn_preinst() { - if [ -z "$IMAGE" ]; then - eerror "${FUNCNAME}: IMAGE is unset" + if [ -z "${D}" ]; then + eerror "${FUNCNAME}: D is unset" return 1 fi [ "$(type -t pre_pkg_preinst)" == "function" ] && qa_call pre_pkg_preinst - declare -r D=${IMAGE} pkg_preinst [ "$(type -t post_pkg_preinst)" == "function" ] && qa_call post_pkg_preinst @@ -1550,11 +1549,9 @@ export S=${WORKDIR}/${P} unset E_IUSE E_DEPEND E_RDEPEND E_PDEPEND -for x in T P PN PV PVR PR CATEGORY A EBUILD EMERGE_FROM O PPID FILESDIR PORTAGE_TMPDIR; do +for x in D T P PN PV PVR PR CATEGORY A EBUILD EMERGE_FROM 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 -[[ ${EBUILD_SH_ARGS} != "preinst" ]] && declare -r D unset x # Turn of extended glob matching so that g++ doesn't get incorrectly matched. |