| 1 |
commit: b07808edb1bc7b7adb36fd8d21ea430d1769d2a7 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 29 18:56:14 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 29 18:56:14 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b07808ed |
| 7 |
|
| 8 |
egencache: fix StatCollision handling breakage |
| 9 |
|
| 10 |
This has been broken since the _eclasses_ structure changed in commit |
| 11 |
2ed1cb53cc4158af08c22d466b15b9a9a7767212. |
| 12 |
|
| 13 |
--- |
| 14 |
bin/egencache | 6 +++--- |
| 15 |
1 files changed, 3 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/bin/egencache b/bin/egencache |
| 18 |
index 38e9833..01eadf0 100755 |
| 19 |
--- a/bin/egencache |
| 20 |
+++ b/bin/egencache |
| 21 |
@@ -258,9 +258,9 @@ class GenCache(object): |
| 22 |
# mtime on the ebuild (and the corresponding cache entry). |
| 23 |
# See bug #139134. |
| 24 |
max_mtime = sc.mtime |
| 25 |
- for ec, (loc, ec_mtime) in metadata['_eclasses_'].items(): |
| 26 |
- if max_mtime < ec_mtime: |
| 27 |
- max_mtime = ec_mtime |
| 28 |
+ for ec, ec_hash in metadata['_eclasses_'].items(): |
| 29 |
+ if max_mtime < ec_hash.mtime: |
| 30 |
+ max_mtime = ec_hash.mtime |
| 31 |
if max_mtime == sc.mtime: |
| 32 |
max_mtime += 1 |
| 33 |
max_mtime = long(max_mtime) |
Archives