From: Mark Hymers <mhy@debian.org>
Date: Sat, 14 Mar 2009 18:13:05 +0000 (+0000)
Subject: Merge commit 'ftpmaster/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=120524e1c7d93d42849629689eccd11a1af66880;hp=c67a020603dc26499b8d9b6ba3d5469fdcbb2567;p=dak.git

Merge commit 'ftpmaster/master'
---

diff --git a/daklib/database.py b/daklib/database.py
index 49c18f9e..93d9ad53 100755
--- a/daklib/database.py
+++ b/daklib/database.py
@@ -848,13 +848,13 @@ def copy_temporary_contents(package, version, arch, deb, reject):
 
     # first see if contents exist:
 
-    arch_id = database.get_architecture_id (architecture)
+    arch_id = get_architecture_id (arch)
 
     exists = projectB.query("""SELECT 1 FROM pending_content_associations
                                WHERE package='%s'
                                AND version='%s'
                                AND architecture=%d LIMIT 1"""
-                            % package, version, arch_id ).getresult()
+                            % (package, version, arch_id) ).getresult()
 
     if not exists:
         # This should NOT happen.  We should have added contents