Fix portdbapi.getfetchsizes() repo handling.
authorZac Medico <zmedico@gentoo.org>
Tue, 2 Nov 2010 08:11:52 +0000 (01:11 -0700)
committerZac Medico <zmedico@gentoo.org>
Tue, 2 Nov 2010 08:11:52 +0000 (01:11 -0700)
pym/_emerge/resolver/output.py
pym/portage/dbapi/porttree.py

index d324d7ef77a13e5a73c77bebd4c951f89a0644ce..9897590b4d8ed6b7fada099aca5bc0fcc79e3aca 100644 (file)
@@ -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
index 938877ca1ae67a9f169f6ede2e7d5118ea2e85ae..979a4883918423a53727062286dd73f0a8877808 100644 (file)
@@ -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: