X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jenna;h=121dee34d91a3e0af344424a656d3c30d87fbff3;hb=ccc8127b612d886ccfdc26366313f985393c18af;hp=d84ffb29726d95328a4fe6290a28e2a504c88bc3;hpb=6c68616c83b577e687f91a6ee75a8139757f213f;p=dak.git

diff --git a/jenna b/jenna
index d84ffb29..121dee34 100755
--- a/jenna
+++ b/jenna
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Generate file list which is then fed to apt-ftparchive to generate Packages and Sources files
-# Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: jenna,v 1.4 2001-01-25 06:00:07 troup Exp $
+# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
+# $Id: jenna,v 1.7 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
@@ -140,8 +140,6 @@ def main():
     global Cnf, projectB;
     dislocated_files = {};
     
-    projectB = pg.connect('projectb', 'localhost');
-    
     apt_pkg.init();
     
     Cnf = apt_pkg.newConfiguration();
@@ -157,6 +155,7 @@ def main():
 
     apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
+    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
 
     if Cnf["Jenna::Options::Suite"] == "":
@@ -189,7 +188,7 @@ def main():
                     output = utils.open_file("%s/%s_%s_binary-%s.list" % (Cnf["Dir::ListsDir"], suite, component, architecture), "w");
                     generate_bin_list(suite, component, architecture, output, "deb", dislocated_files);
                     output.close();
-                    if component == "main": # FIXME: must be a cleaner way to say debian-installer is main only?
+                    if component == "main" and (suite == "unstable" or suite == "testing"): # FIXME: must be a cleaner way to say debian-installer is main only?
                         print "Processing dists/%s/%s/debian-installer/binary-%s..." % (suite,component, architecture);
                         output = utils.open_file("%s/%s_%s_debian-installer_binary-%s.list" % (Cnf["Dir::ListsDir"], suite, component, architecture), "w");
                         generate_bin_list(suite, component, architecture, output, "udeb", dislocated_files);