diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-10 05:49:06 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-10 05:49:06 +0000 |
| commit | 74a1223255e752a64b45dfff217af4f50807c590 (patch) | |
| tree | 64d69671b2317f5c6395cb8acafe0dab525cbd56 | |
| parent | f4c0b2491133b44db9ff76f64551557bfcf73ffb (diff) | |
| download | portage-74a1223255e752a64b45dfff217af4f50807c590.tar.gz portage-74a1223255e752a64b45dfff217af4f50807c590.tar.bz2 portage-74a1223255e752a64b45dfff217af4f50807c590.zip | |
Fix introspection code in fetch() so that it works correctly when myuris isv2.1.7.13
an OrderedDict instance. This fixes broken fetching for some packages.
(trunk r15019)
svn path=/main/branches/2.1.7/; revision=15020
| -rw-r--r-- | pym/portage/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 8518b4795..cb6ce4e97 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -4511,7 +4511,8 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", locations = mymirrors file_uri_tuples = [] - if isinstance(myuris, dict): + # Check for 'items' attribute since OrderedDict is not a dict. + if hasattr(myuris, 'items'): for myfile, uri_set in myuris.items(): for myuri in uri_set: file_uri_tuples.append((myfile, myuri)) |