From: James Troup Date: Fri, 14 Sep 2001 17:15:39 +0000 (+0000) Subject: whitespace X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=c258fe2bf5c4f44690d8e74c0f847c1aca634959;p=dak.git whitespace --- diff --git a/neve b/neve index a5ca0d17..eb092bab 100755 --- a/neve +++ b/neve @@ -2,7 +2,7 @@ # Populate the DB # Copyright (C) 2000, 2001 James Troup -# $Id: neve,v 1.4 2001-06-22 22:53:14 troup Exp $ +# $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": @@ -306,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,7 +317,7 @@ def main (): print output 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,7 +358,7 @@ def main (): # do_sources(location, prefix); else: utils.fubar("Unknown location type ('%s')." % (type)); - + # Process Packages files to populate `binaries' and friends for location in Cnf.SubTree("Location").List(): @@ -381,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(); @@ -411,8 +411,8 @@ def main (): print output if (result != 0): utils.fubar("psql invocation failed!\n%s" % (output), result); - + return; - + if __name__ == '__main__': main()