summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-04-11 06:49:59 +0000
committerZac Medico <zmedico@gentoo.org>2006-04-11 06:49:59 +0000
commit41b6ab4619e72321784de4753e67f3945ad13775 (patch)
tree6e637a9600ce8f975ea72ec12e5d69caa42d4867
parente3b0ef371b31e177f0bc4d2c441eb75e14a05d46 (diff)
downloadportage-41b6ab4619e72321784de4753e67f3945ad13775.tar.gz
portage-41b6ab4619e72321784de4753e67f3945ad13775.tar.bz2
portage-41b6ab4619e72321784de4753e67f3945ad13775.zip
Make qmerge imply noclean for bug #129559.
svn path=/main/trunk/; revision=3128
-rw-r--r--pym/portage.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py
index d58d9a968..9e5ebc4a8 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2715,6 +2715,9 @@ def doebuild(myebuild,mydo,myroot,mysettings,debug=0,listonly=0,fetchonly=0,clea
if not os.path.exists(mysettings["PORTAGE_BUILDDIR"]+"/.installed"):
print "!!! mydo=qmerge, but install phase hasn't been ran"
sys.exit(1)
+ # qmerge is a special phase that implies noclean.
+ if "noclean" not in mysettings.features:
+ mysettings.features.append("noclean")
#qmerge is specifically not supposed to do a runtime dep check
return merge(mysettings["CATEGORY"],mysettings["PF"],mysettings["D"],mysettings["PORTAGE_BUILDDIR"]+"/build-info",myroot,mysettings,myebuild=mysettings["EBUILD"],mytree=tree)
elif mydo=="merge":