From: Arfrever Frehtes Taifersar Arahesis Date: Sat, 26 Nov 2011 01:52:49 +0000 (+0100) Subject: dblink.mergeme(): Merge files in alphabetic order. X-Git-Tag: v2.2.0_alpha78~1 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1d4ac47c28706094230cb2c4e6ee1c1c71629aa0;p=portage.git dblink.mergeme(): Merge files in alphabetic order. --- diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index dd74c10f4..099164a93 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(mergelist): + for i, x in enumerate(sorted(mergelist)): mysrc = join(srcroot, offset, x) mydest = join(destroot, offset, x)