X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=3dd73b3c36252d4c0cd7bc9ea63b9ec7e9606a66;hb=cee1cdafb0e66fb17f97c9c71ba0cb0a62a1813b;hp=d4b14293161a321a3630acae51e8bbf9c6deb741;hpb=1c4e1b1a2a3be107a6111b65d0d226ed80e91d76;p=dak.git

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index d4b14293..3dd73b3c 100755
--- 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', \
@@ -1583,7 +1583,8 @@ class Location(ORMObject):
         self.archive_type = 'pool'
 
     def properties(self):
-        return ['path', 'archive_type', 'component', 'files_count']
+        return ['path', 'location_id', 'archive_type', 'component', \
+            'files_count']
 
     def not_null_constraints(self):
         return ['path', 'archive_type']