Handle the doebuild's unmerge phase before setting up logfile because unmerge doesn...

svn path=/main/trunk/; revision=3285

diff --git a/pym/portage.py b/pym/portage.py
index 1bb7c17e925852b6f81f313f160b1f4dbec1b0e1..c298ec02730e9da8dc9282e02afae5090677ab28 100644 (file)
--- 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)