From 7c5b170d47ab054bc3f8a7778dd3f8139c1239c6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 27 Nov 2011 12:53:55 -0800 Subject: Revert "dblink.mergeme(): Merge files in alphabetic order." 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.3-1-g7c22