From 70633503d9ead111505f554e3aaf21bf659a399d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 30 Apr 2006 11:43:54 +0000 Subject: [PATCH] Handle the doebuild's unmerge phase before setting up logfile because unmerge doesn't use the log. svn path=/main/trunk/; revision=3285 --- pym/portage.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/portage.py b/pym/portage.py index 1bb7c17e9..c298ec027 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2675,15 +2675,15 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, if mystatus: return mystatus + if mydo == "unmerge": + return unmerge(mysettings["CATEGORY"], + mysettings["PF"], myroot, mysettings) + if "PORT_LOGDIR" in mysettings: logfile = os.path.join(mysettings["PORT_LOGDIR"], "%s-%s.log" % (str(vartree.dbapi.get_counter_tick_core("/")), mysettings["PF"])) - if mydo=="unmerge": - return unmerge(mysettings["CATEGORY"], - mysettings["PF"], myroot, mysettings) - # if any of these are being called, handle them -- running them out of the sandbox -- and stop now. if mydo in ["clean","cleanrm"]: return spawn(EBUILD_SH_BINARY+" clean",mysettings,debug=debug,free=1,logfile=None) -- 2.26.2