Revert "dblink.mergeme(): Merge files in alphabetic order." v2.2.0_alpha79
authorZac Medico <zmedico@gentoo.org>
Sun, 27 Nov 2011 20:53:55 +0000 (12:53 -0800)
committerZac Medico <zmedico@gentoo.org>
Sun, 27 Nov 2011 20:53:55 +0000 (12:53 -0800)
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

pym/portage/dbapi/vartree.py

index 099164a9333a92c82b549b1ab059eedb18370308..dd74c10f4e02aa1853a5c808858a6d375405f271 100644 (file)
@@ -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)