1 |
commit: 1d4ac47c28706094230cb2c4e6ee1c1c71629aa0 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Gentoo <DOT> Org> |
3 |
AuthorDate: Sat Nov 26 01:52:49 2011 +0000 |
4 |
Commit: Arfrever Frehtes Taifersar Arahesis <arfrever <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 26 01:52:49 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1d4ac47c |
7 |
|
8 |
dblink.mergeme(): Merge files in alphabetic order. |
9 |
|
10 |
--- |
11 |
pym/portage/dbapi/vartree.py | 2 +- |
12 |
1 files changed, 1 insertions(+), 1 deletions(-) |
13 |
|
14 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
15 |
index dd74c10..099164a 100644 |
16 |
--- a/pym/portage/dbapi/vartree.py |
17 |
+++ b/pym/portage/dbapi/vartree.py |
18 |
@@ -3981,7 +3981,7 @@ class dblink(object): |
19 |
mergelist = stufftomerge |
20 |
offset = "" |
21 |
|
22 |
- for i, x in enumerate(mergelist): |
23 |
+ for i, x in enumerate(sorted(mergelist)): |
24 |
|
25 |
mysrc = join(srcroot, offset, x) |
26 |
mydest = join(destroot, offset, x) |