| 1 |
commit: 7c5b170d47ab054bc3f8a7778dd3f8139c1239c6 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 27 20:53:55 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 27 20:53:55 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7c5b170d |
| 7 |
|
| 8 |
Revert "dblink.mergeme(): Merge files in alphabetic order." |
| 9 |
|
| 10 |
This reverts commit 1d4ac47c28706094230cb2c4e6ee1c1c71629aa0. |
| 11 |
As discussed on the gentoo-portage-dev mailing list, if we don't have |
| 12 |
a compelling reason to sort here then it's just a waste: |
| 13 |
|
| 14 |
http://archives.gentoo.org/gentoo-portage-dev/msg_67b08fcd7a1b832b347caf1b19362cbb.xml |
| 15 |
|
| 16 |
--- |
| 17 |
pym/portage/dbapi/vartree.py | 2 +- |
| 18 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 19 |
|
| 20 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 21 |
index 099164a..dd74c10 100644 |
| 22 |
--- a/pym/portage/dbapi/vartree.py |
| 23 |
+++ b/pym/portage/dbapi/vartree.py |
| 24 |
@@ -3981,7 +3981,7 @@ class dblink(object): |
| 25 |
mergelist = stufftomerge |
| 26 |
offset = "" |
| 27 |
|
| 28 |
- for i, x in enumerate(sorted(mergelist)): |
| 29 |
+ for i, x in enumerate(mergelist): |
| 30 |
|
| 31 |
mysrc = join(srcroot, offset, x) |
| 32 |
mydest = join(destroot, offset, x) |
Archives