summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-03-10 23:53:02 +0000
committerZac Medico <zmedico@gentoo.org>2006-03-10 23:53:02 +0000
commit5cbad62bf29d1c9bc85d0f7ce87d29a90a9388e4 (patch)
treec30db46dac02e07df60b86f0c548c1a98e752f89
parentcd219536929f24fa576848b920bae7dd6d2e223e (diff)
downloadportage-5cbad62bf29d1c9bc85d0f7ce87d29a90a9388e4.tar.gz
portage-5cbad62bf29d1c9bc85d0f7ce87d29a90a9388e4.tar.bz2
portage-5cbad62bf29d1c9bc85d0f7ce87d29a90a9388e4.zip
Do cleanup of cruft prior to the setup phase for binary packages. See bug #85803.
svn path=/main/trunk/; revision=2841
-rw-r--r--pym/portage.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 1e318623b..1b8b020af 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6490,7 +6490,9 @@ def pkgmerge(mytbz2,myroot,mysettings):
os.chdir(pkgloc)
mysettings.configdict["pkg"]["CATEGORY"] = mycat;
- a=doebuild(myebuild,"setup",myroot,mysettings,tree="bintree")
+ # Eventually we'd like to pass in the saved ebuild env here.
+ # Do cleanup=1 to ensure that there is no cruft prior to the setup phase.
+ a = doebuild(myebuild, "setup", myroot, mysettings, tree="bintree", cleanup=1)
writemsg_stdout(">>> Extracting %s\n" % mypkg)
notok=spawn("bzip2 -dqc -- '"+mytbz2+"' | tar xpf -",mysettings,free=1)
if notok: