X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cindy;h=a963ea4c174bcf23e5470390bec64df34e24d038;hb=980efb995a8d365df5ad5901243330335929d9ba;hp=af4370380b677125ec3c80d46dd9e0955b070319;hpb=4b41dc06229eed89f52f397fc7df5d665fa092cf;p=dak.git

diff --git a/cindy b/cindy
index af437038..a963ea4c 100755
--- a/cindy
+++ b/cindy
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Output override files for apt-ftparchive and indices/
-# Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: cindy,v 1.1 2001-01-16 21:52:37 troup Exp $
+# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
+# $Id: cindy,v 1.3 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
@@ -73,21 +73,22 @@ def process(suite, component, type):
             if not packages.has_key(package):
                 if not src_packages.has_key(package):
                     print "DELETING: %s" % (package);
-                    projectB.query("DELETE FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s"
-                                   % (package, suite_id, component_id, type_id));
+                    #projectB.query("DELETE FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s"
+                    #% (package, suite_id, component_id, type_id));
                 else:
                     print "MAKING SOURCE: %s" % (package);
-                    projectB.query("DELETE FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s"
-                                   % (package, suite_id, component_id, type_id));
+                    #projectB.query("DELETE FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s"
+                    #% (package, suite_id, component_id, type_id));
                     # Then if source doesn't already have a copy, insert it into source
                     q = projectB.query("SELECT package FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s" % (package, suite_id, component_id, dsc_type_id));
                     if q.getresult() == []:
-                        projectB.query("INSERT INTO override (package, suite, component, priority, section, type, maintainer) VALUES ('%s', %s, %s, %s, %s, %s, '%s')" % (package, suite_id, component_id, i[1], i[2], dsc_type_id, i[3]));
+                        #projectB.query("INSERT INTO override (package, suite, component, priority, section, type, maintainer) VALUES ('%s', %s, %s, %s, %s, %s, '%s')" % (package, suite_id, component_id, i[1], i[2], dsc_type_id, i[3]));
+                        print "(nop)"
         else: # dsc
             if not src_packages.has_key(package):
                 print "DELETING: %s" % (package);
-                projectB.query("DELETE FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s"
-                               % (package, suite_id, component_id, type_id));
+                #projectB.query("DELETE FROM override WHERE package = '%s' AND suite = %s AND component = %s AND type = %s"
+                #% (package, suite_id, component_id, type_id));
     projectB.query("COMMIT WORK");
             
 
@@ -105,7 +106,7 @@ def main ():
                  ('V',"version","Denise::Options::Version")];
     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);
 
     for suite in [ "stable", "unstable" ]: