From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 1 Jun 2006 07:59:03 +0000 (-0000)
Subject: Fix --buildpkgonly so that the "clean" phase is run afterwards.  In other cases,... 
X-Git-Tag: v2.1~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=52c7c592040ff379b0e7b334fa85eef904b45a7d;p=portage.git

Fix --buildpkgonly so that the "clean" phase is run afterwards.  In other cases, "clean" is triggered automatically after the package is merged.

svn path=/main/trunk/; revision=3445
---

diff --git a/bin/emerge b/bin/emerge
index ae3dfeb98..ced6c0efc 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2036,6 +2036,9 @@ class depgraph:
 						retval=portage.pkgmerge(mytbz2,myroot,self.pkgsettings)
 						if retval is None:
 							sys.exit(1)
+					elif "noclean" not in self.pkgsettings.features:
+						portage.doebuild(y, "clean", myroot, self.pkgsettings,
+							edebug, tree="porttree")
 				else:
 					short_msg = "emerge: ("+str(mergecount)+" of "+str(len(mymergelist))+") "+x[pkgindex]+" Clean"
 					emergelog(" === ("+str(mergecount)+" of "+str(len(mymergelist))+") Cleaning ("+x[pkgindex]+"::"+y+")", short_msg=short_msg)