Fix introspection code in fetch() so that it works correctly when myuris is

an OrderedDict instance. This fixes broken fetching for some packages.
(trunk r15019)

svn path=/main/branches/2.1.7/; revision=15020

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 8518b47953901e54b774d6fbf6d3fe298ecdd2f7..cb6ce4e97ded947102a813c079a7efd7c629f6d6 100644 (file)
--- 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))