summaryrefslogtreecommitdiff
path: root/trunk
diff options
context:
space:
mode:
authorfuzzyray <fuzzyray@gentoo.org>2008-07-24 16:03:19 +0000
committerfuzzyray <fuzzyray@gentoo.org>2008-07-24 16:03:19 +0000
commit65d33c19c85f59f372d34f6eb8a364c0b393f5d2 (patch)
treea8fc40e9825e5b5515fbe2667ea1bb817185e918 /trunk
parent997d74b44ab2808c493459054d0a636cfc26cd0b (diff)
downloadgentoolkit-65d33c19c85f59f372d34f6eb8a364c0b393f5d2.tar.gz
Fix equery check to convert mtime to an integer so that comparisions always work.
svn path=/; revision=502
Diffstat (limited to 'trunk')
-rw-r--r--trunk/ChangeLog5
-rwxr-xr-xtrunk/src/equery/equery2
2 files changed, 6 insertions, 1 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index 5e3cb9f..4ec5c13 100644
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-24: Paul Varner <fuzzyray@gentoo.org>
+ * equery: Fix equery check to convert mtime to an integer so that
+ comparisions always work. Thanks to Alexey Parshin for discovering the
+ problem and providing a patch. (Bug 232803)
+
2008-07-22: Paul Varner <fuzzyray@gentoo.org>
* gentoolkit: Fix gentoolkit.split_package_name to work with
newer portage.catpkgsplit that now returns a tuple instead of a
diff --git a/trunk/src/equery/equery b/trunk/src/equery/equery
index 9d8f876..ed8c5c4 100755
--- a/trunk/src/equery/equery
+++ b/trunk/src/equery/equery
@@ -976,7 +976,7 @@ class CmdCheckIntegrity(Command):
if self.getMD5sum(file) != md5sum:
raise CheckException(file + " has incorrect md5sum")
if opts["checkTimestamp"]:
- if st.st_mtime != int(mtime):
+ if int(st.st_mtime) != int(mtime):
raise CheckException(file + (" has wrong mtime (is %d, should be %s)" % (st.st_mtime, mtime)))
elif type == "sym":
# FIXME: nastry strippery; portage should have this fixed!