From 5cbad62bf29d1c9bc85d0f7ce87d29a90a9388e4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 10 Mar 2006 23:53:02 +0000 Subject: Do cleanup of cruft prior to the setup phase for binary packages. See bug #85803. svn path=/main/trunk/; revision=2841 --- pym/portage.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pym') 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: -- cgit v1.2.3-1-g7c22