* katie.py (source_exists): expand the list of distributionsthe source may exist...

[dak.git] / jenna

diff --git a/jenna b/jenna
index 8fb54eb0f4dff767c47a94636b68cb6e9d1d4c73..50bed8fe12fda9883cdfc1e98ff09dac0535a258 100755 (executable)
--- a/jenna
+++ b/jenna
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Generate file lists used by apt-ftparchive to generate Packages and Sources files
-# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: jenna,v 1.20 2002-07-14 15:02:07 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
+# $Id: jenna,v 1.25 2003-05-02 13:53:57 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
@@ -61,7 +61,7 @@ Write out file lists suitable for use with apt-ftparchive.
   -n, --no-delete           don't delete older versions
   -s, --suite=SUITE         only write file lists for this suite
 
-ARCH, COMPONENT and SUITE can be space seperated lists, e.g.
+ARCH, COMPONENT and SUITE can be space separated lists, e.g.
     --architecture=\"m68k i386\"""";
     sys.exit(exit_code);
 
@@ -105,7 +105,7 @@ def resolve_arch_all_vs_any(versions, packages):
         unique_id = i[1];
         arch = packages[unique_id]["arch"];
         if arch == "all":
-            arch_all_versions = i;
+            arch_all_versions = [i];
             arch_all_version = i[0];
             arch_any_versions.remove(i);
     # Sort arch: any versions into descending order
@@ -148,7 +148,7 @@ def remove_duplicate_versions(versions, packages):
     # Remove all but the highest
     delete_packages(dominated_versions, pkg, arch, suite,
                     dominant_version, delete_table, delete_col, packages);
-    return dominant_versions;
+    return [dominant_versions];
 
 ################################################################################
 
@@ -185,14 +185,14 @@ def cleanup(packages):
             # Check to see if we have arch: all and arch: !all (ignoring source)
             num_arches = len(arches.keys());
             if arches.has_key("source"):
-                num_arches = num_arches - 1;
+                num_arches -= 1;
             # If we do, remove the duplicates
             if num_arches > 1:
                 versions = [];
                 for arch in arches.keys():
                     if arch != "source":
                         versions.extend(d[suite][pkg][arch]);
-                remove_duplicate_versions(versions, packages);
+                resolve_arch_all_vs_any(versions, packages);
 
 ################################################################################
 
@@ -281,14 +281,14 @@ def write_filelists(packages, dislocated_files):
     if not Options["Suite"]:
         suites = Cnf.SubTree("Suite").List();
     else:
-        suites = string.split(Options["Suite"]);
+        suites = Options["Suite"].split();
     for suite in map(string.lower, suites):
         if not d.has_key(suite):
             d[suite] = {};
         if not Options["Component"]:
             components = Cnf.ValueList("Suite::%s::Components" % (suite));
         else:
-            components = string.split(Options["Components"]);
+            components = Options["Components"].split();
         udeb_components = Cnf.ValueList("Suite::%s::UdebComponents" % (suite));
         udeb_components = udeb_components;
         for component in components:
@@ -301,7 +301,7 @@ def write_filelists(packages, dislocated_files):
             if not Options["Architecture"]:
                 architectures = Cnf.ValueList("Suite::%s::Architectures" % (suite));
             else:
-                architectures = string.split(Options["Architectures"]);
+                architectures = Options["Architectures"].split();
             for arch in map(string.lower, architectures):
                 if not d[suite][component].has_key(arch):
                     d[suite][component][arch] = {};
@@ -349,7 +349,7 @@ def stable_dislocation_p():
     if not Options["Suite"]:
         return 1;
     # Otherwise, look in what suites the user specified
-    suites = string.split(Options["Suite"]);
+    suites = Options["Suite"].split();
     return suites.count("stable");
 
 ################################################################################
@@ -372,7 +372,7 @@ SELECT b.id, b.package, a.arch_string, b.version, l.path, f.filename, c.name,
     AND f.location = l.id AND l.component = c.id AND ba.suite = su.id
     %s %s %s""" % (con_suites, con_architectures, con_components);
     if check_source:
-        query = query + """
+        query += """
 UNION
 SELECT s.id, s.source, 'source', s.version, l.path, f.filename, c.name, f.id,
        su.suite_name, 'dsc'
@@ -387,7 +387,7 @@ SELECT s.id, s.source, 'source', s.version, l.path, f.filename, c.name, f.id,
     for i in ql:
         (id, pkg, arch, version, path, filename, component, file_id, suite, type) = i;
         # 'id' comes from either 'binaries' or 'source', so it's not unique
-        unique_id = unique_id + 1;
+        unique_id += 1;
         packages[unique_id] = Dict(id=id, pkg=pkg, arch=arch, version=version,
                                    path=path, filename=filename,
                                    component=component, file_id=file_id,
@@ -417,7 +417,7 @@ def main():
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]));
     db_access.init(Cnf, projectB);
     Logger = logging.Logger(Cnf, "jenna");
-    do_da_do_da();
+    utils.try_with_debug(do_da_do_da);
     Logger.close();
 
 #########################################################################################