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

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index d4b14293..aa71c180 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -1161,8 +1161,8 @@ class PoolFile(ORMObject):
     def fullpath(self):
         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
+    def is_valid(self, filesize = -1, md5sum = None):
+        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']