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 aa06141957131902e43b7bf0b39af2fda368464d..0d26836d93b8dbf33ff62b857f68d766f1415838 100755 (executable)
--- 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 8b39c621f089b3deb74e072982d3a3b149aa75af..991f2b634dfc84a0495980cad683056b40e04252 100644 (file)
--- 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