diff options
| -rwxr-xr-x | bin/ebuild.sh | 5 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 041d5fa4d..c274680f0 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) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 2a596fa86..2cf46461e 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -5430,8 +5430,7 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, # Build directory creation isn't required for any of these. have_build_dirs = False - if mydo not in ("clean", "cleanrm", "digest", - "fetch", "help", "manifest"): + if mydo not in ("digest", "help", "manifest"): mystatus = prepare_build_dirs(myroot, mysettings, cleanup) if mystatus: return mystatus |