dblink.mergeme(): Merge files in alphabetic order.
authorArfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>
Sat, 26 Nov 2011 01:52:49 +0000 (02:52 +0100)
committerArfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>
Sat, 26 Nov 2011 01:52:49 +0000 (02:52 +0100)
pym/portage/dbapi/vartree.py

index dd74c10f4e02aa1853a5c808858a6d375405f271..099164a9333a92c82b549b1ab059eedb18370308 100644 (file)
@@ -3981,7 +3981,7 @@ class dblink(object):
                        mergelist = stufftomerge
                        offset = ""
 
-               for i, x in enumerate(mergelist):
+               for i, x in enumerate(sorted(mergelist)):
 
                        mysrc = join(srcroot, offset, x)
                        mydest = join(destroot, offset, x)