diff options
Diffstat (limited to 'pym/portage/__init__.py')
-rw-r--r-- | pym/portage/__init__.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 87f5ec108..0a6731bb2 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -71,6 +71,7 @@ try: import portage.proxy.lazyimport import portage.proxy as proxy proxy.lazyimport.lazyimport(globals(), + 'portage.cache.mappings:OrderedDict', 'portage.checksum', 'portage.checksum:perform_checksum,perform_md5,prelink_capable', 'portage.cvstree', @@ -132,6 +133,13 @@ except ImportError as e: sys.stderr.write(" "+str(e)+"\n\n") raise +try: + from collections import OrderedDict +except ImportError: + # lazy import is above + # from portage.cache.mappings import OrderedDict + pass + if sys.hexversion >= 0x3000000: basestring = str long = int @@ -4531,7 +4539,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", for myuri in myuris: file_uri_tuples.append((os.path.basename(myuri), myuri)) - filedict={} + filedict = OrderedDict() primaryuri_indexes={} primaryuri_dict = {} thirdpartymirror_uris = {} |