Merge branch 'master' into dbtests

[dak.git] / daklib / dbconn.py

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index efe2d13761551a7f243c512a81cd779a33b35a0f..e8a68390c5989bfdffbc655785c413c1d550f33f 100755 (executable)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -1162,7 +1162,7 @@ class PoolFile(ORMObject):
         return os.path.join(self.location.path, self.filename)
 
     def is_valid(self, filesize = -1, md5sum = None):\
-        return self.filesize == filesize and self.md5sum == md5sum
+        return self.filesize == long(filesize) and self.md5sum == md5sum
 
     def properties(self):
         return ['filename', 'file_id', 'filesize', 'md5sum', 'sha1sum', \
@@ -1575,8 +1575,6 @@ __all__.append('get_dbchange')
 
 ################################################################################
 
-# TODO: Why do we have a separate Location class? Can't it be fully integrated
-# into class Component?
 class Location(ORMObject):
     def __init__(self, path = None, component = None):
         self.path = path