summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-11-27 12:53:55 -0800
committerZac Medico <zmedico@gentoo.org>2011-11-27 12:53:55 -0800
commit7c5b170d47ab054bc3f8a7778dd3f8139c1239c6 (patch)
treeb2b3accf088880978fa5cc9df1b54a92a6f60f30
parent_get_dep_chain: fix KeyError, bug #392059 (diff)
downloadportage-2.2.0_alpha79.tar.gz
portage-2.2.0_alpha79.tar.bz2
portage-2.2.0_alpha79.zip
Revert "dblink.mergeme(): Merge files in alphabetic order."v2.2.0_alpha79
This reverts commit 1d4ac47c28706094230cb2c4e6ee1c1c71629aa0. As discussed on the gentoo-portage-dev mailing list, if we don't have a compelling reason to sort here then it's just a waste: http://archives.gentoo.org/gentoo-portage-dev/msg_67b08fcd7a1b832b347caf1b19362cbb.xml
-rw-r--r--pym/portage/dbapi/vartree.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 099164a93..dd74c10f4 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3981,7 +3981,7 @@ class dblink(object):
mergelist = stufftomerge
offset = ""
- for i, x in enumerate(sorted(mergelist)):
+ for i, x in enumerate(mergelist):
mysrc = join(srcroot, offset, x)
mydest = join(destroot, offset, x)