diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-10 05:48:00 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-10 05:48:00 +0000 |
| commit | 1cf22705298a358ea2a2e9afa78be69b70751951 (patch) | |
| tree | 6c5f3ea8151721ea7a76c9cd1474e5813293b1f0 | |
| parent | e5464e5237a00d6545d7d9039618fb72086e740b (diff) | |
| download | portage-1cf22705298a358ea2a2e9afa78be69b70751951.tar.gz portage-1cf22705298a358ea2a2e9afa78be69b70751951.tar.bz2 portage-1cf22705298a358ea2a2e9afa78be69b70751951.zip | |
Fix introspection code in fetch() so that it works correctly when myuris isv2.2_rc58
an OrderedDict instance. This fixes broken fetching for some packages.
svn path=/main/trunk/; revision=15019
| -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 7ed9df4a6..c13a7149b 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)) |