From 26482fa143f1464ca29bb517514f4b955c6868a4 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 5 May 2009 08:18:53 +0000 Subject: [PATCH] Make portdbapi.getfetchlist() return an equal number of uris/file names so that no information is lost. svn path=/main/trunk/; revision=13613 --- pym/portage/dbapi/porttree.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index 2fc55ccc9..3b160a2c4 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -719,10 +719,15 @@ class portdbapi(dbapi): mysettings.setcpv(mypkg, mydb=self) useflags = mysettings["PORTAGE_USE"].split() uri_map = self.getFetchMap(mypkg, useflags=useflags, mytree=mytree) - uris = set() - for uri_set in uri_map.itervalues(): - uris.update(uri_set) - return [list(uris), uri_map.keys()] + + all_uris = [] + all_files = [] + for filename, uris in uri_map.iteritems(): + for uri in uris: + all_uris.append(uri) + all_files.append(filename) + + return [all_uris, all_files] def getfetchsizes(self, mypkg, useflags=None, debug=0): # returns a filename:size dictionnary of remaining downloads -- 2.26.2