X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=b532c351ac050d22ccd5434100058d520a7f04a0;hb=1e66768e2088bc974e4c9b00bbd6d53ae617d8a8;hp=2b13123e50423f837a11ff61baba4811ffca6c72;hpb=3388a6723b0170fd91484320fdd74ba185f7b6e3;p=dak.git

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 2b13123e..b532c351 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -398,11 +398,11 @@ class DBConn(Singleton):
             else:
                 row = cursor.fetchone()
 
-                if row[1] != size or row[2] != md5sum:
+                if row[1] != int(size) or row[2] != md5sum:
                     res =  -2
 
                 else:
-                    self.caches[cachename].SetValue(values, row[0])
+                    self.caches['files'].SetValue(values, row[0])
                     res = row[0]
 
         return res
@@ -552,9 +552,9 @@ class DBConn(Singleton):
             c.execute("""DELETE FROM pending_content_associations
                          WHERE package=%(Package)s
                          AND version=%(Version)s
-                         AND arch_id=%(ArchID)s""", {'Package': package['Package'],
-                                                     'Version': package['Version'],
-                                                     'ArchID':  arch_id})
+                         AND architecture=%(ArchID)s""", {'Package': package['Package'],
+                                                          'Version': package['Version'],
+                                                          'ArchID':  arch_id})
 
             for fullpath in fullpaths:
                 (path, file) = os.path.split(fullpath)