#!/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, 2004 James Troup <james@nocrew.org>
+# $Id: jenna,v 1.26 2004-01-21 03:22:23 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
-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);
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
# 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];
################################################################################
# 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);
################################################################################
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["Component"].split();
udeb_components = Cnf.ValueList("Suite::%s::UdebComponents" % (suite));
udeb_components = udeb_components;
for component in components:
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] = {};
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");
################################################################################
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'
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,