From: Michael Casadevall <sonicmctails@gmail.com>
Date: Thu, 1 Jan 2009 16:42:31 +0000 (-0500)
Subject: Fixed it so the fingerprint table is properly referenced vs the uid
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cd389cc6a64de00500f349db12046d7a87783e2;p=dak

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 f86cf42f..617dcc00 100644
--- 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 a7ceb20a..5c027c51 100644
--- 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 a95de5fc..14a9c775 100755
--- 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)