Specify ebuildpath to merge() when using qmerge
authorJason Stubbs <jstubbs@gentoo.org>
Sun, 2 Oct 2005 14:47:53 +0000 (14:47 -0000)
committerJason Stubbs <jstubbs@gentoo.org>
Sun, 2 Oct 2005 14:47:53 +0000 (14:47 -0000)
svn path=/main/branches/2.0/; revision=2075

pym/portage.py

index 6655e2c3a24736ab56bf82e5214dee6eebadf3bc..2786bdcec8f4fb6bcee52958fb50399947af1248 100644 (file)
@@ -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: