From 9794d481c67bb84eedc583e813ba079fcb7cbc08 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 26 Nov 2007 19:02:05 +0000 Subject: * In doebuild(), don't create directories for the "clean" or "unmerge". * Fix dyn_clean() to clean the status file and return early when appropriate. svn path=/main/trunk/; revision=8692 --- pym/portage/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pym') diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 29fcbda54..67b461db2 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -4261,9 +4261,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 @@ -4272,15 +4276,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. -- cgit v1.2.3-1-g7c22