Fixed it so the fingerprint table is properly referenced vs the uid

Obviously my brain checked out halfway through designing on this;
feel free to insult me greatly

Signed-off-by: Michael Casadevall <sonicmctails@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index f86cf42f0ef852241b3356e4707a06c6fb158f7c..617dcc00f9c1588bf833c6703b04c7bd933fe530 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-01  Michael Casadevall  <sonicmctails@gmail.com>
+
+       * dak/process_unchecked.pu - Changed it to look up on the correct table
+
+       * dak/dakdb/update1.py  - Changed to add the right table
+
 2008-12-30  Michael Casadevall  <sonicmctails@gmail.com>
 
        * src/sql-aptvc.cpp     - Fixed to work on modern postgresql version

diff --git a/dak/dakdb/update1.py b/dak/dakdb/update1.py
index a7ceb20a164b22eca0164648623d5c871a082739..5c027c51ef01f8d7545aa050e68b6ddb4d7f81b9 100644 (file)
--- a/dak/dakdb/update1.py
+++ b/dak/dakdb/update1.py
@@ -34,7 +34,7 @@ def do_update(self):
     try:
        c = self.db.cursor()
        c.execute("ALTER TABLE source ADD COLUMN dm_upload_allowed BOOLEAN DEFAULT 'no' NOT NULL;")
-       c.execute("ALTER TABLE uid ADD COLUMN debian_maintainer BOOLEAN DEFAULT 'false' NOT NULL;")
+       c.execute("ALTER TABLE fingerprint ADD COLUMN is_dm BOOLEAN DEFAULT 'false' NOT NULL;")
 
        print "Migrating DM data to source table. This might take some time ..."
 

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index a95de5fce04ff3a3aabc4e2ac667feabaa738799..14a9c775b6663cb8f35f792a65cd9bc49c3672f6 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -997,7 +997,7 @@ def check_timestamps():
 ################################################################################
 
 def lookup_uid_from_fingerprint(fpr):
-    q = Upload.projectB.query("SELECT u.uid, u.name, u.debian_maintainer FROM fingerprint f, uid u WHERE f.uid = u.id AND f.fingerprint = '%s'" % (fpr))
+    q = Upload.projectB.query("SELECT u.uid, u.name, f.is_dm FROM fingerprint f, uid u WHERE f.uid = u.id AND f.fingerprint = '%s'" % (fpr))
     qs = q.getresult()
     if len(qs) == 0:
         return (None, None)