summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorBrian Harring <ferringb@gentoo.org>2006-01-07 23:48:43 +0000
committerBrian Harring <ferringb@gentoo.org>2006-01-07 23:48:43 +0000
commit47f119c14529901844f08fb956f6921056e5545a (patch)
tree4c4f7f825131badbc32ea0418cd54fd622816857 /pym
parent3483fe2969c3d1239e8281a1a0646e65b8b3beab (diff)
downloadportage-47f119c14529901844f08fb956f6921056e5545a.tar.gz
portage-47f119c14529901844f08fb956f6921056e5545a.tar.bz2
portage-47f119c14529901844f08fb956f6921056e5545a.zip
bug 117440, added PORTAGE_ACTUAL_DISTDIR var to make cvs/svn eclasses play nice since they're not part of our SRC_URI scheme (yet).
svn path=/main/trunk/; revision=2543
Diffstat (limited to 'pym')
-rw-r--r--pym/portage.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 155d07968..06338665c 100644
--- 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: