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 1SKK14-0000ax-R9 for garchives@archives.gentoo.org; Wed, 18 Apr 2012 01:49:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69AA8E0D69; Wed, 18 Apr 2012 01:48:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3B777E0D69 for ; Wed, 18 Apr 2012 01:48:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BBE51B4011 for ; Wed, 18 Apr 2012 01:48:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EF192E5403 for ; Wed, 18 Apr 2012 01:48:51 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1334713712.5bd8b8a41326d16d4e8347bcddfee0d4ff8f6bd3.zmedico@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: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5bd8b8a41326d16d4e8347bcddfee0d4ff8f6bd3 X-VCS-Branch: master Date: Wed, 18 Apr 2012 01:48:51 +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: 309c40b7-614a-4436-acbb-d600b590f518 X-Archives-Hash: 198b100f9471bd52a585eb6f31266213 commit: 5bd8b8a41326d16d4e8347bcddfee0d4ff8f6bd3 Author: Greg Turner ameritech net> AuthorDate: Wed Apr 18 01:48:32 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Apr 18 01:48:32 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5bd8b8a4 mergeme: cleanup hardlink_candidates, bug #412453 --- pym/portage/dbapi/vartree.py | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 25ea4c1..a3a6c76 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1452,7 +1452,7 @@ class dblink(object): self._contents_inodes =3D None self._contents_basenames =3D None self._linkmap_broken =3D False - self._md5_merge_map =3D {} + self._hardlink_merge_map =3D {} self._hash_key =3D (self._eroot, self.mycpv) self._protect_obj =3D None self._pipe =3D pipe @@ -4500,10 +4500,10 @@ class dblink(object): # as hardlinks (having identical st_dev and st_ino). hardlink_key =3D (mystat.st_dev, mystat.st_ino) =20 - hardlink_candidates =3D self._md5_merge_map.get(hardlink_key) + hardlink_candidates =3D self._hardlink_merge_map.get(hardlink_key) if hardlink_candidates is None: hardlink_candidates =3D [] - self._md5_merge_map[hardlink_key] =3D hardlink_candidates + self._hardlink_merge_map[hardlink_key] =3D hardlink_candidates =20 mymtime =3D movefile(mysrc, mydest, newmtime=3Dthismtime, sstat=3Dmystat, mysettings=3Dself.settings, @@ -4511,8 +4511,7 @@ class dblink(object): encoding=3D_encodings['merge']) if mymtime is None: return 1 - if hardlink_candidates is not None: - hardlink_candidates.append(mydest) + hardlink_candidates.append(mydest) zing =3D ">>>" =20 if mymtime !=3D None: