diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-12-22 00:53:31 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-12-22 00:53:31 +0000 |
| commit | 19a35944ac0f7010791fd4d7d03147a679bb6446 (patch) | |
| tree | 8e22babbe2259ed3aac6c37140af5d0168d1beaf | |
| parent | ee491da35646a8f405eb5666c1c9f961d82ffe6b (diff) | |
| download | portage-19a35944ac0f7010791fd4d7d03147a679bb6446.tar.gz portage-19a35944ac0f7010791fd4d7d03147a679bb6446.tar.bz2 portage-19a35944ac0f7010791fd4d7d03147a679bb6446.zip | |
Fix the "help" phase so that it works without build dirs.
svn path=/main/trunk/; revision=5347
| -rwxr-xr-x | bin/ebuild.sh | 4 | ||||
| -rw-r--r-- | pym/portage.py | 2 |
2 files changed, 4 insertions, 2 deletions
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 |