diff options
| author | Jason Stubbs <jstubbs@gentoo.org> | 2005-10-02 14:47:53 +0000 |
|---|---|---|
| committer | Jason Stubbs <jstubbs@gentoo.org> | 2005-10-02 14:47:53 +0000 |
| commit | ec80b6632e3b30208e6967f12ed35ab28ebf7040 (patch) | |
| tree | 209ae89dc7f044f0b56ddbd23dffc732edf3a707 | |
| parent | b94c99696e8f8318e5265bf46dd84c34a4d513e4 (diff) | |
| download | portage-ec80b6632e3b30208e6967f12ed35ab28ebf7040.tar.gz portage-ec80b6632e3b30208e6967f12ed35ab28ebf7040.tar.bz2 portage-ec80b6632e3b30208e6967f12ed35ab28ebf7040.zip | |
Specify ebuildpath to merge() when using qmerge
svn path=/main/branches/2.0/; revision=2075
| -rw-r--r-- | pym/portage.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |