X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=neve;h=eb092bab533f473b341f62379c8573a606003b5c;hb=7b229c4db5ae4d45dc08cc94c63460395f8e06f1;hp=bb8b5f8cee1c25c1e71dc0f16e101e62e018985c;hpb=07241fcd65bb2808804fe2a6e53807997ee9025b;p=dak.git

diff --git a/neve b/neve
index bb8b5f8c..eb092bab 100755
--- a/neve
+++ b/neve
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Populate the DB
-# Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: neve,v 1.1.1.1 2000-11-24 00:20:09 troup Exp $
+# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
+# $Id: neve,v 1.5 2001-09-14 17:15:39 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
@@ -133,7 +133,7 @@ def get_or_set_files_id (filename, size, md5sum, location_id):
         files_id_serial = files_id_serial + 1
         files_query_cache.write("%d\t%s\t%s\t%s\t%d\n" % (files_id_serial, filename, size, md5sum, location_id));
         files_id_cache[cache_key] = files_id_serial
-        
+
     return files_id_cache[cache_key]
 
 ##############################################################################################################
@@ -199,7 +199,7 @@ def process_sources (location, filename, suite, component, archive):
                 dsc_files_query_cache.write("%d\t%d\t%d\n" % (dsc_files_id_serial, tmp_source_id,id));
         else:
             tmp_source_id = source_cache[cache_key];
-            
+
         src_associations_id_serial = src_associations_id_serial + 1;
         src_associations_query_cache.write("%d\t%d\t%d\n" % (src_associations_id_serial, suite_id, tmp_source_id))
         # populate 'testing' with a mirror of 'stable'
@@ -213,7 +213,7 @@ def process_sources (location, filename, suite, component, archive):
 
 def process_packages (location, filename, suite, component, archive):
     global arch_all_cache, binary_cache, binaries_id_serial, binaries_query_cache, bin_associations_id_serial, bin_associations_query_cache;
-    
+
     count_total = 0;
     count_bad = 0;
     suite = string.lower(suite);
@@ -272,7 +272,7 @@ def process_packages (location, filename, suite, component, archive):
                 tmp_binaries_id = binaries_id_serial;
             else:
                 tmp_binaries_id = binary_cache[cache_key];
-            
+
             bin_associations_id_serial = bin_associations_id_serial + 1;
             bin_associations_query_cache.write("%d\t%d\t%d\n" % (bin_associations_id_serial, suite_id, tmp_binaries_id));
             if suite == "stable":
@@ -295,8 +295,7 @@ def do_sources(location, prefix, suite, component, server):
     sources = location + prefix + 'Sources.gz';
     (result, output) = commands.getstatusoutput("gunzip -c %s > %s" % (sources, temp_filename));
     if (result != 0):
-        sys.stderr.write("Gunzip invocation failed!\n%s\n" % (output));
-        sys.exit(result);
+        utils.fubar("Gunzip invocation failed!\n%s" % (output), result);
     print 'Processing '+sources+'...';
     process_sources (location, temp_filename, suite, component, server);
     os.unlink(temp_filename);
@@ -307,7 +306,7 @@ def main ():
     global Cnf, projectB, query_cache, files_query_cache, source_query_cache, src_associations_query_cache, dsc_files_query_cache, bin_associations_query_cache, binaries_query_cache;
 
     apt_pkg.init();
-    
+
     Cnf = apt_pkg.newConfiguration();
     apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
 
@@ -317,8 +316,8 @@ def main ():
         sys.exit(2)
     print output
 
-    projectB = pg.connect('projectb', 'localhost', -1, None, None, 'postgres')
-      
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]), None, None, 'postgres')
+
     db_access.init (Cnf, projectB);
 
     print "Adding static tables from conf file..."
@@ -358,9 +357,8 @@ def main ():
 #                prefix = component + '/'
 #                do_sources(location, prefix);
         else:
-            sys.stderr.write("Unknown location type ('%s').\n" % (type));
-            sys.exit(2);
-    
+            utils.fubar("Unknown location type ('%s')." % (type));
+
     # Process Packages files to populate `binaries' and friends
 
     for location in Cnf.SubTree("Location").List():
@@ -383,7 +381,7 @@ def main ():
                         process_packages (location, packages, suite, component, server);
         elif type == "pool":
             continue;
-            
+
     files_query_cache.close();
     source_query_cache.close();
     src_associations_query_cache.close();
@@ -412,10 +410,9 @@ def main ():
     (result, output) = commands.getstatusoutput("psql projectb < add_constraints.sql");
     print output
     if (result != 0):
-        sys.stderr.write("psql invocation failed!\n");
-        sys.exit(result);
-    
+        utils.fubar("psql invocation failed!\n%s" % (output), result);
+
     return;
-            
+
 if __name__ == '__main__':
     main()