Merge branch 'master' into content_generation

[dak.git] / daklib / dbconn.py

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 2b13123e50423f837a11ff61baba4811ffca6c72..38791290b244a8b6c65987277bfed71b5483668d 100755 (executable)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -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)
@@ -552,9 +554,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)