From: Jason Stubbs Date: Sun, 2 Oct 2005 14:47:53 +0000 (-0000) Subject: Specify ebuildpath to merge() when using qmerge X-Git-Tag: v2.0.53_rc4_2111~23 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ec80b6632e3b30208e6967f12ed35ab28ebf7040;p=portage.git Specify ebuildpath to merge() when using qmerge svn path=/main/branches/2.0/; revision=2075 --- diff --git a/pym/portage.py b/pym/portage.py index 6655e2c3a..2786bdcec 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2759,7 +2759,7 @@ def doebuild(myebuild,mydo,myroot,mysettings,debug=0,listonly=0,fetchonly=0,clea print "!!! mydo=qmerge, but install phase hasn't been ran" sys.exit(1) #qmerge is specifically not supposed to do a runtime dep check - return merge(mysettings["CATEGORY"],mysettings["PF"],mysettings["D"],mysettings["BUILDDIR"]+"/build-info",myroot,mysettings) + return merge(mysettings["CATEGORY"],mysettings["PF"],mysettings["D"],mysettings["BUILDDIR"]+"/build-info",myroot,mysettings,myebuild=mysettings["EBUILD"]) elif mydo=="merge": retval=spawnebuild("install",actionmap,mysettings,debug,alwaysdep=1,logfile=logfile) if retval: