From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 22 Dec 2006 00:53:31 +0000 (-0000)
Subject: Fix the "help" phase so that it works without build dirs.
X-Git-Tag: v2.1.2~249
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19a35944ac0f7010791fd4d7d03147a679bb6446;p=portage.git

Fix the "help" phase so that it works without build dirs.

svn path=/main/trunk/; revision=5347
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index aa0614195..0d26836d9 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1656,7 +1656,9 @@ for myarg in ${EBUILD_SH_ARGS} ; do
 done
 
 # Save the env only for relevant phases.
-if [ -n "$myarg" ] && [ "$myarg" != "clean" ]; then
+if [ -n "${myarg}" ] && \
+	[ "${myarg}" != "clean" ] && \
+	[ "${myarg}" != "help" ] ; then
 	# Do not save myarg in the env, or else the above [ -n "$myarg" ] test will
 	# give a false positive when ebuild.sh is sourced.
 	unset myarg
diff --git a/pym/portage.py b/pym/portage.py
index 8b39c621f..991f2b634 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3134,7 +3134,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 			return 1
 
 		# Build directory creation isn't required for any of these.
-		if mydo not in ["fetch","digest","manifest"]:
+		if mydo not in ("digest", "fetch", "help", "manifest"):
 			mystatus = prepare_build_dirs(myroot, mysettings, cleanup)
 			if mystatus:
 				return mystatus