X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=21bcbb17c33067abb53bee037efc1e136e07d2c4;hb=0e1df5636799153ae78c13d299b772b0654106c8;hp=2c4d1a0e470747d07371b60e2484584567067f72;hpb=b7e5c9a6deda1018da9023d1d01acec86e165ba4;p=dak.git

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 2c4d1a0e..21bcbb17 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
@@ -514,6 +514,8 @@ class DBConn(Singleton):
             for fullpath in fullpaths:
                 (path, file) = os.path.split(fullpath)
 
+                if path.startswith( "./" ):
+                    path = path[2:]
                 # Get the necessary IDs ...
                 file_id = self.get_or_set_contents_file_id(file)
                 path_id = self.get_or_set_contents_path_id(path)
@@ -546,13 +548,15 @@ class DBConn(Singleton):
 
         c.execute("BEGIN WORK")
         try:
-            arch_id = self.get_architecture_id(package[Architecture])
+            arch_id = self.get_architecture_id(package['Architecture'])
 
-                # Remove any already existing recorded files for this package
+            # Remove any already existing recorded files for this package
             c.execute("""DELETE FROM pending_content_associations
                          WHERE package=%(Package)s
                          AND version=%(Version)s
-                         AND arch_id=%d""" % arch_id, package )
+                         AND architecture=%(ArchID)s""", {'Package': package['Package'],
+                                                          'Version': package['Version'],
+                                                          'ArchID':  arch_id})
 
             for fullpath in fullpaths:
                 (path, file) = os.path.split(fullpath)