From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 12 May 2013 19:47:46 +0000 (-0700)
Subject: ebuild.sh: use PORTAGE_PYM_PATH as default cwd
X-Git-Tag: v2.2.0_alpha175~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ac42c83d7779ead2ac11ee075d078881095b3d32;p=portage.git

ebuild.sh: use PORTAGE_PYM_PATH as default cwd
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 2293938bc..cb5fca733 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -145,11 +145,9 @@ export SANDBOX_ON=0
 
 # Ensure that $PWD is sane whenever possible, to protect against
 # exploitation of insecure search path for python -c in ebuilds.
-# See bug #239560.
-if ! has "$EBUILD_PHASE" clean cleanrm depend help ; then
-	cd "$PORTAGE_BUILDDIR" || \
-		die "PORTAGE_BUILDDIR does not exist: '$PORTAGE_BUILDDIR'"
-fi
+# See bug #239560 and bug #469338.
+cd "${PORTAGE_PYM_PATH}" || \
+	die "PORTAGE_PYM_PATH does not exist: '${PORTAGE_PYM_PATH}'"
 
 #if no perms are specified, dirs/files will have decent defaults
 #(not secretive, but not stupid)