summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-10-05 05:09:33 +0000
committerZac Medico <zmedico@gentoo.org>2008-10-05 05:09:33 +0000
commit177c09dcc037d568fe421de0b5d7ddc3c618f352 (patch)
tree9beb3570474de812f2a7bd2b7ab8d772a45e8e7a /bin/ebuild.sh
parentOnly update the confmem file when something has changed. (diff)
downloadportage-multirepo-177c09dcc037d568fe421de0b5d7ddc3c618f352.tar.gz
portage-multirepo-177c09dcc037d568fe421de0b5d7ddc3c618f352.tar.bz2
portage-multirepo-177c09dcc037d568fe421de0b5d7ddc3c618f352.zip
* When ensuring sane $PWD in ebuild.sh, die if the `cd "$PORTAGE_BUILDDIR"`
call fails. * Create $PORTAGE_BUILDDIR for the "fetch" phase too since it might be necessary to call pkg_nofetch. svn path=/main/trunk/; revision=11628
Diffstat (limited to 'bin/ebuild.sh')
-rwxr-xr-xbin/ebuild.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 041d5fa4..c274680f 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -273,7 +273,10 @@ register_die_hook() {
}
# Ensure that $PWD is sane whenever possible.
-cd "$PORTAGE_BUILDDIR" 2>/dev/null
+if ! hasq "$EBUILD_PHASE" clean depend help ; then
+ cd "$PORTAGE_BUILDDIR" || \
+ die "PORTAGE_BUILDDIR does not exist: '$PORTAGE_BUILDDIR'"
+fi
#if no perms are specified, dirs/files will have decent defaults
#(not secretive, but not stupid)