From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RU7TY-0004n8-38 for garchives@archives.gentoo.org; Sat, 26 Nov 2011 01:54:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16ADF21C038; Sat, 26 Nov 2011 01:54:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D452C21C038 for ; Sat, 26 Nov 2011 01:54:36 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 555BB1B4023 for ; Sat, 26 Nov 2011 01:54:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 79B1280042 for ; Sat, 26 Nov 2011 01:54:35 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arfrever Frehtes Taifersar Arahesis" Message-ID: <1d4ac47c28706094230cb2c4e6ee1c1c71629aa0.arfrever@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis X-VCS-Revision: 1d4ac47c28706094230cb2c4e6ee1c1c71629aa0 Date: Sat, 26 Nov 2011 01:54:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 86baec45-c825-4556-bcf7-5aa9a85e98fb X-Archives-Hash: 635790bd8a42d751a76c267b2e171ae7 commit: 1d4ac47c28706094230cb2c4e6ee1c1c71629aa0 Author: Arfrever Frehtes Taifersar Arahesis Gentoo Org> AuthorDate: Sat Nov 26 01:52:49 2011 +0000 Commit: Arfrever Frehtes Taifersar Arahesis gentoo org> CommitDate: Sat Nov 26 01:52:49 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D1d4ac47c dblink.mergeme(): Merge files in alphabetic order. --- pym/portage/dbapi/vartree.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index dd74c10..099164a 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3981,7 +3981,7 @@ class dblink(object): mergelist =3D stufftomerge offset =3D "" =20 - for i, x in enumerate(mergelist): + for i, x in enumerate(sorted(mergelist)): =20 mysrc =3D join(srcroot, offset, x) mydest =3D join(destroot, offset, x)