Fix database name to be a config option. Fix debian/rules typo. [Ryan Murray]

[dak.git] / heidi

diff --git a/heidi b/heidi
index 2ce00e7bc6160626c14e115f56a0e4f03716897d..c2f5071bb6b2dae1317c1f563239d1a13916c4ef 100755 (executable)
--- a/heidi
+++ b/heidi
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Manipulate suite tags
-# Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: heidi,v 1.2 2000-12-05 04:27:48 troup Exp $
+# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
+# $Id: heidi,v 1.5 2001-03-20 00:28:11 troup Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -56,14 +56,14 @@ projectB = None;
 def process_file (file, suite_id, action):
 
     if action == "set":
-        projectB.query("DELETE FROM bin_associations WHERE suite = %d" % (suite_id));
-        projectB.query("DELETE FROM src_associations WHERE suite = %d" % (suite_id));
+        projectB.query("DELETE FROM bin_associations WHERE suite = %s" % (suite_id));
+        projectB.query("DELETE FROM src_associations WHERE suite = %s" % (suite_id));
         action = "add";
         
     for line in file.readlines():
         split_line = string.split(string.strip(line[:-1]));
         if len(split_line) != 3:
-            sys.stderr.write("W: '%s' does not break into 'package version architecture'.\n");
+            sys.stderr.write("W: '%s' does not break into 'package version architecture'.\n" % (line[:-1]));
             continue;
         
         (package, version, architecture) = split_line;
@@ -84,7 +84,7 @@ def process_file (file, suite_id, action):
 
         if architecture == "source": 
             # Find the existing assoications ID, if any
-            q = projectB.query("SELECT id FROM src_associations WHERE suite = %d and source = %d" % (suite_id, id));
+            q = projectB.query("SELECT id FROM src_associations WHERE suite = %s and source = %s" % (suite_id, id));
             ql = q.getresult();
             if ql == []:
                 assoication_id = None;
@@ -93,19 +93,19 @@ def process_file (file, suite_id, action):
             # Take action
             if action == "add":
                 if assoication_id != None:
-                    sys.stderr.write("W: '%s~%s~%s' already exists in suite %d.\n" % (package, version, architecture, suite_id));
+                    sys.stderr.write("W: '%s~%s~%s' already exists in suite %s.\n" % (package, version, architecture, suite_id));
                     continue;
                 else:
-                    q = projectB.query("INSERT INTO src_associations (suite, source) VALUES (%d, %d)" % (suite_id, id));
+                    q = projectB.query("INSERT INTO src_associations (suite, source) VALUES (%s, %s)" % (suite_id, id));
             elif action == "remove":
                 if assoication_id == None:
-                    sys.stderr.write("W: '%s~%s~%s' doesn't exist in suite %d.\n" % (package, version, architecture, suite_id));
+                    sys.stderr.write("W: '%s~%s~%s' doesn't exist in suite %s.\n" % (package, version, architecture, suite_id));
                     continue;
                 else:
-                    q = projectB.query("DELETE FROM src_associations WHERE id = %d" % (assoication_id));
+                    q = projectB.query("DELETE FROM src_associations WHERE id = %s" % (assoication_id));
         else:
             # Find the existing assoications ID, if any
-            q = projectB.query("SELECT id FROM bin_associations WHERE suite = %d and bin = %d" % (suite_id, id));
+            q = projectB.query("SELECT id FROM bin_associations WHERE suite = %s and bin = %s" % (suite_id, id));
             ql = q.getresult();
             if ql == []:
                 assoication_id = None;
@@ -114,31 +114,31 @@ def process_file (file, suite_id, action):
             # Take action
             if action == "add":
                 if assoication_id != None:
-                    sys.stderr.write("W: '%s~%s~%s' already exists in suite %d.\n" % (package, version, architecture, suite_id));
+                    sys.stderr.write("W: '%s~%s~%s' already exists in suite %s.\n" % (package, version, architecture, suite_id));
                     continue;
                 else:
-                    q = projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%d, %d)" % (suite_id, id));
+                    q = projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%s, %s)" % (suite_id, id));
             elif action == "remove":
                 if assoication_id == None:
-                    sys.stderr.write("W: '%s~%s~%s' doesn't exist in suite %d.\n" % (package, version, architecture, suite_id));
+                    sys.stderr.write("W: '%s~%s~%s' doesn't exist in suite %s.\n" % (package, version, architecture, suite_id));
                     continue;
                 else:
-                    q = projectB.query("DELETE FROM bin_associations WHERE id = %d" % (assoication_id));
+                    q = projectB.query("DELETE FROM bin_associations WHERE id = %s" % (assoication_id));
               
 #######################################################################################
 
 def get_list (suite_id):
     # List binaries
-    q = projectB.query("SELECT b.package, b.version, a.arch_string FROM binaries b, bin_associations ba, architecture a WHERE ba.suite = %d AND ba.bin = b.id AND b.architecture = a.id" % (suite_id));
+    q = projectB.query("SELECT b.package, b.version, a.arch_string FROM binaries b, bin_associations ba, architecture a WHERE ba.suite = %s AND ba.bin = b.id AND b.architecture = a.id" % (suite_id));
     ql = q.getresult();
     for i in ql:
-        print "%s %s %s" % (i[0], i[1], i[2]);
+        print string.join(i);
 
     # List source
-    q = projectB.query("SELECT s.source, s.version FROM source s, src_associations sa WHERE sa.suite = %d AND sa.source = s.id" % (suite_id));
+    q = projectB.query("SELECT s.source, s.version FROM source s, src_associations sa WHERE sa.suite = %s AND sa.source = s.id" % (suite_id));
     ql = q.getresult();
     for i in ql:
-        print "%s %s source" % (i[0], i[1]);
+        print string.join(i) + " source";
 
 #######################################################################################
 
@@ -160,7 +160,7 @@ def main ():
 
     file_list = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
-    projectB = pg.connect('projectb', 'localhost');
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"],int(Cnf["DB::Port"]));
 
     db_access.init(Cnf, projectB);
 
@@ -194,7 +194,7 @@ def main ():
     else:
         if file_list != []:
             for file in file_list:
-                process_file(utils.open_file(file_list[0],'r'), suite_id, action);
+                process_file(utils.open_file(file,'r'), suite_id, action);
         else:
             process_file(sys.stdin, suite_id, action);