From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 22 May 2007 22:45:21 +0000 (-0000)
Subject: Discard metadata from the Packages file if there's no MTIME attribute.
X-Git-Tag: v2.2_pre1~1387
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c6c83296bb1918a8b36e03c0e63b880d7de296b;p=portage.git

Discard metadata from the Packages file if there's no MTIME attribute.

svn path=/main/trunk/; revision=6585
---

diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 5ec32d252..6e0800b08 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -456,17 +456,11 @@ class binarytree(object):
 					update_pkgindex = True
 					d = metadata.get(mycpv, {})
 					if d:
-						# Reuse metadata such as MD5, since we won't calculate
-						# MD5 here due to the performance hit.
-						mtime = d.get("MTIME")
-						if mtime:
-							# genpgkindex really should include the mtime and
-							# then this mtime check should be forced.
-							try:
-								if long(mtime) != long(s.st_mtime):
-									d.clear()
-							except ValueError:
+						try:
+							if long(d["MTIME"]) != long(s.st_mtime):
 								d.clear()
+						except (KeyError, ValueError):
+							d.clear()
 					if d:
 						try:
 							if long(d["SIZE"]) != long(s.st_size):