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 1RKE50-0008NS-DM for garchives@archives.gentoo.org; Sat, 29 Oct 2011 18:56:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 621FAE031D; Sat, 29 Oct 2011 18:56:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 354C9E031D for ; Sat, 29 Oct 2011 18:56:23 +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 ABCD21B4006 for ; Sat, 29 Oct 2011 18:56:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 103AF80042 for ; Sat, 29 Oct 2011 18:56:22 +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: Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/egencache X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b07808edb1bc7b7adb36fd8d21ea430d1769d2a7 Date: Sat, 29 Oct 2011 18:56:22 +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: X-Archives-Hash: 9225a6eb71df12f155a708a0a1b8335a commit: b07808edb1bc7b7adb36fd8d21ea430d1769d2a7 Author: Zac Medico gentoo org> AuthorDate: Sat Oct 29 18:56:14 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Oct 29 18:56:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Db07808ed egencache: fix StatCollision handling breakage This has been broken since the _eclasses_ structure changed in commit 2ed1cb53cc4158af08c22d466b15b9a9a7767212. --- bin/egencache | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/egencache b/bin/egencache index 38e9833..01eadf0 100755 --- a/bin/egencache +++ b/bin/egencache @@ -258,9 +258,9 @@ class GenCache(object): # mtime on the ebuild (and the corresponding cache entry). # See bug #139134. max_mtime =3D sc.mtime - for ec, (loc, ec_mtime) in metadata['_eclasses_'].items(): - if max_mtime < ec_mtime: - max_mtime =3D ec_mtime + for ec, ec_hash in metadata['_eclasses_'].items(): + if max_mtime < ec_hash.mtime: + max_mtime =3D ec_hash.mtime if max_mtime =3D=3D sc.mtime: max_mtime +=3D 1 max_mtime =3D long(max_mtime)