From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Nov 2010 08:11:52 +0000 (-0700)
Subject: Fix portdbapi.getfetchsizes() repo handling.
X-Git-Tag: v2.2.0_alpha4~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e11ea04cc94657bd6950f62c50f2f7ee3e3172fa;p=portage.git

Fix portdbapi.getfetchsizes() repo handling.
---

diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py
index d324d7ef7..9897590b4 100644
--- a/pym/_emerge/resolver/output.py
+++ b/pym/_emerge/resolver/output.py
@@ -535,7 +535,7 @@ def display(depgraph, mylist, favorites=[], verbosity=None):
 				if pkg_type == "ebuild" and pkg_merge:
 					try:
 						myfilesdict = portdb.getfetchsizes(pkg_key,
-							useflags=pkg_use, debug=conf.edebug)
+							useflags=pkg_use, myrepo=pkg.repo)
 					except InvalidDependString:
 						# should have been masked before it was selected
 						raise
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 938877ca1..979a48839 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -570,7 +570,7 @@ class portdbapi(dbapi):
 
 	def getfetchsizes(self, mypkg, useflags=None, debug=0, myrepo=None):
 		# returns a filename:size dictionnary of remaining downloads
-		myebuild = self.findname(mypkg, myrepo=myrepo)
+		myebuild, mytree = self.findname2(mypkg, myrepo=myrepo)
 		if myebuild is None:
 			raise AssertionError(_("ebuild not found for '%s'") % mypkg)
 		pkgdir = os.path.dirname(myebuild)
@@ -581,7 +581,7 @@ class portdbapi(dbapi):
 				writemsg(_("[empty/missing/bad digest]: %s\n") % (mypkg,))
 			return {}
 		filesdict={}
-		myfiles = self.getFetchMap(mypkg, useflags=useflags)
+		myfiles = self.getFetchMap(mypkg, useflags=useflags, mytree=mytree)
 		#XXX: maybe this should be improved: take partial downloads
 		# into account? check checksums?
 		for myfile in myfiles: