From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 29 Oct 2011 18:56:14 +0000 (-0700)
Subject: egencache: fix StatCollision handling breakage
X-Git-Tag: v2.2.0_alpha72~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b07808edb1bc7b7adb36fd8d21ea430d1769d2a7;p=portage.git

egencache: fix StatCollision handling breakage

This has been broken since the _eclasses_ structure changed in commit
2ed1cb53cc4158af08c22d466b15b9a9a7767212.
---

diff --git a/bin/egencache b/bin/egencache
index 38e983361..01eadf053 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 = sc.mtime
-					for ec, (loc, ec_mtime) in metadata['_eclasses_'].items():
-						if max_mtime < ec_mtime:
-							max_mtime = ec_mtime
+					for ec, ec_hash in metadata['_eclasses_'].items():
+						if max_mtime < ec_hash.mtime:
+							max_mtime = ec_hash.mtime
 					if max_mtime == sc.mtime:
 						max_mtime += 1
 					max_mtime = long(max_mtime)