Fix --buildpkgonly so that the "clean" phase is run afterwards. In other cases,...

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

diff --git a/bin/emerge b/bin/emerge
index ae3dfeb9802de3d1ba35db6c738875b6b5707b27..ced6c0efc569761d7860cd98c3c78e3dcae951c3 100755 (executable)
--- 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)