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

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 24cb9044..2c4d1a0e 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -546,11 +546,13 @@ class DBConn(Singleton):
 
         c.execute("BEGIN WORK")
         try:
+            arch_id = self.get_architecture_id(package[Architecture])
 
                 # Remove any already existing recorded files for this package
             c.execute("""DELETE FROM pending_content_associations
                          WHERE package=%(Package)s
-                         AND version=%(Version)s""", package )
+                         AND version=%(Version)s
+                         AND arch_id=%d""" % arch_id, package )
 
             for fullpath in fullpaths:
                 (path, file) = os.path.split(fullpath)
@@ -562,9 +564,10 @@ class DBConn(Singleton):
                 path_id = self.get_or_set_contents_path_id(path)
 
                 c.execute("""INSERT INTO pending_content_associations
-                               (package, version, filepath, filename)
-                           VALUES (%%(Package)s, %%(Version)s, '%d', '%d')""" % (path_id, file_id),
-                          package )
+                               (package, version, architecture, filepath, filename)
+                            VALUES (%%(Package)s, %%(Version)s, '%d', '%d', '%d')"""
+                    % (arch_id, path_id, file_id), package )
+
             c.execute("COMMIT")
             return True
         except: