final cleanups for indirect distfiles, exempt fetch phase also.
authorBrian Harring <ferringb@gentoo.org>
Mon, 26 Dec 2005 07:40:45 +0000 (07:40 -0000)
committerBrian Harring <ferringb@gentoo.org>
Mon, 26 Dec 2005 07:40:45 +0000 (07:40 -0000)
svn path=/main/trunk/; revision=2478

pym/portage.py

index 0e9f5ff6c07e5a8541e86d5165255f50e4ab4430..25dc4d850770c7b5b05834fb9511f3fe98e48967 100644 (file)
@@ -2794,8 +2794,8 @@ def doebuild(myebuild,mydo,myroot,mysettings,debug=0,listonly=0,fetchonly=0,clea
 
        # inefficient.  improve this logic via making actionmap easily searchable to see if we're in the chain of what
        # will be executed, either that or forced N doebuild calls instead of a single set of phase calls.
-       if (mydo not in ("setup", "clean", "postinst", "preinst", "prerm","digest","manifest") and "noauto" not in features) or \
-               mydo == "unpack":
+       if (mydo not in ("setup", "clean", "postinst", "preinst", "prerm", "fetch", "digest", "manifest") and 
+               "noauto" not in features) or mydo == "unpack":
                orig_distdir = mysettings["DISTDIR"]
                edpath = mysettings["DISTDIR"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "distdir")
                if os.path.exists(edpath):