diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-26 19:05:27 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-26 19:05:27 +0000 |
| commit | f444eb008882654af0f7d83426060c07fbf6ab64 (patch) | |
| tree | b6703c533f5e4cc4e6541b169c2ca7468dbfc917 | |
| parent | 9aba5f55c5fad3b308efd54204851097f45f1881 (diff) | |
| download | portage-f444eb008882654af0f7d83426060c07fbf6ab64.tar.gz portage-f444eb008882654af0f7d83426060c07fbf6ab64.tar.bz2 portage-f444eb008882654af0f7d83426060c07fbf6ab64.zip | |
* In doebuild(), don't create directories for the "clean" or "unmerge".
* Fix dyn_clean() to clean the status file and return early when appropriate.
(trunk r8692)
svn path=/main/branches/2.1.2/; revision=8693
| -rwxr-xr-x | bin/ebuild.sh | 4 | ||||
| -rw-r--r-- | pym/portage.py | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index b8ca584d4..9c4436697 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -659,8 +659,9 @@ dyn_clean() { if [ -z "${PORTAGE_BUILDDIR}" ]; then echo "Aborting clean phase because PORTAGE_BUILDDIR is unset!" return 1 + elif [ ! -d "${PORTAGE_BUILDDIR}" ] ; then + return 0 fi - if type -P chflags > /dev/null ; then chflags -R noschg,nouchg,nosappnd,nouappnd "${PORTAGE_BUILDDIR}" chflags -R nosunlnk,nouunlnk "${PORTAGE_BUILDDIR}" 2>/dev/null @@ -675,6 +676,7 @@ dyn_clean() { fi if ! hasq keepwork $FEATURES; then + rm -rf "${PORTAGE_BUILDDIR}/.exit_status" rm -rf "${PORTAGE_BUILDDIR}/.logid" rm -rf "${PORTAGE_BUILDDIR}/.unpacked" rm -rf "${PORTAGE_BUILDDIR}/.compiled" diff --git a/pym/portage.py b/pym/portage.py index 963090086..7f0a54ce4 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -4220,9 +4220,13 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, "correct your PORTAGE_TMPDIR setting.\n", noiselevel=-1) return 1 + if mydo == "unmerge": + return unmerge(mysettings["CATEGORY"], + mysettings["PF"], myroot, mysettings, vartree=vartree) + # Build directory creation isn't required for any of these. have_build_dirs = False - if mydo not in ("digest", "fetch", "help", "manifest"): + if mydo not in ("clean", "digest", "fetch", "help", "manifest"): mystatus = prepare_build_dirs(myroot, mysettings, cleanup) if mystatus: return mystatus @@ -4231,15 +4235,11 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, logfile = mysettings.get("PORTAGE_LOG_FILE") if logfile and not os.access(os.path.dirname(logfile), os.W_OK): logfile = None - if have_build_dirs: _doebuild_exit_status_unlink( mysettings.get("EBUILD_EXIT_STATUS_FILE")) else: mysettings.pop("EBUILD_EXIT_STATUS_FILE", None) - if mydo == "unmerge": - return unmerge(mysettings["CATEGORY"], - mysettings["PF"], myroot, mysettings, vartree=vartree) # if any of these are being called, handle them -- running them out of # the sandbox -- and stop now. |