Merged from trunk -r15027:15029
authorFabian Groffen <grobian@gentoo.org>
Sat, 12 Dec 2009 11:48:35 +0000 (11:48 -0000)
committerFabian Groffen <grobian@gentoo.org>
Sat, 12 Dec 2009 11:48:35 +0000 (11:48 -0000)
commit437619f403e55cbb8aac11f912f9f6fb325e65bc
tree8ac154e696ee8d80f816eca4b46193e1c5c7e387
parentd2fd51aa75cd0e1a11034bcf5cdc1cd29b81c937
   Merged from trunk -r15027:15029

   | 15028   | Use collections.OrderedDict when available (python-2.7) and  |
   | zmedico | fall back to portage.cache.mappings.OrderedDict for older    |
   |         | python. Also, use OrderedDict inside fetch() so that files   |
   |         | are fetched in the order that they appear in SRC_URI.        |

   | 15029   | Don't use lazy import for portage.cache.mappings because     |
   | zmedico | it's imported anyway.                                        |

svn path=/main/branches/prefix/; revision=15053
pym/portage/__init__.py
pym/portage/dbapi/porttree.py