summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-17 23:18:12 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-17 23:18:12 +0000
commitf3ed2ee4f69b89cf0e4c7b5a8fca690692b90aaa (patch)
tree3f6089b4cf2a65ad0f2053bf820d50dea85845b4
parent59a0d542a51c3bc0165d47a9688ecb5025fe63fe (diff)
downloadportage-f3ed2ee4f69b89cf0e4c7b5a8fca690692b90aaa.tar.gz
portage-f3ed2ee4f69b89cf0e4c7b5a8fca690692b90aaa.tar.bz2
portage-f3ed2ee4f69b89cf0e4c7b5a8fca690692b90aaa.zip
Make sure that doebuild gets the correct CATEGORY. See bug #137105.
svn path=/main/trunk/; revision=3524
-rwxr-xr-xbin/emerge2
-rw-r--r--pym/portage.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge
index f05e8d2bf..a5b15211e 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1951,6 +1951,8 @@ class depgraph:
for x in mymergelist:
if x[0] != "ebuild":
continue
+ self.pkgsettings.reset()
+ self.pkgsettings.setcpv(x[2])
try:
ret = portage.doebuild(portage.portdb.findname(x[2]), "fetch", x[1], self.pkgsettings,
cleanup=0, fetchonly=True, tree="porttree")
diff --git a/pym/portage.py b/pym/portage.py
index 60d28f599..70e7c6733 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1513,6 +1513,8 @@ class config:
self.puse = newpuse
self.configdict["pkg"]["PKGUSE"] = self.puse[:] # For saving to PUSE file
self.configdict["pkg"]["USE"] = self.puse[:] # this gets appended to USE
+ # CATEGORY is essential for doebuild calls
+ self.configdict["pkg"]["CATEGORY"] = mycpv.split("/")[0]
self.reset(keeping_pkg=1,use_cache=use_cache)
def setinst(self,mycpv,mydbapi):