bug 117440, added PORTAGE_ACTUAL_DISTDIR var to make cvs/svn eclasses play nice since...

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

diff --git a/pym/portage.py b/pym/portage.py
index 155d079689dfe297d58191de2f1a4436c5b06a34..06338665cc23c835ddce16379a84fc5ed23449a5 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2809,7 +2809,8 @@ def doebuild(myebuild,mydo,myroot,mysettings,debug=0,listonly=0,fetchonly=0,clea
        # 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", "fetch", "digest", "manifest") and 
                "noauto" not in features) or mydo == "unpack":
-               orig_distdir = mysettings["DISTDIR"]
+               # remove PORTAGE_ACTUAL_DISTDIR once cvs/svn is supported via SRC_URI
+               mysettings["PORTAGE_ACTUAL_DISTDIR"] = orig_distdir = mysettings["DISTDIR"]
                edpath = mysettings["DISTDIR"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "distdir")
                if os.path.exists(edpath):
                        try: