X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jenna;h=8fb54eb0f4dff767c47a94636b68cb6e9d1d4c73;hb=f4a1c7be4eed509abd330f5b850a88bb699cabfc;hp=95cba74bd8bcaa274eaa239e0025aaff2ebd3308;hpb=93f1efa5d1e619cbba7b097373068e7bc5179d88;p=dak.git

diff --git a/jenna b/jenna
index 95cba74b..8fb54eb0 100755
--- a/jenna
+++ b/jenna
@@ -2,7 +2,7 @@
 
 # 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.18 2002-06-05 00:18:39 troup Exp $
+# $Id: jenna,v 1.20 2002-07-14 15:02:07 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
@@ -67,63 +67,6 @@ ARCH, COMPONENT and SUITE can be space seperated lists, e.g.
 
 ################################################################################
 
-# Handle -a, -c and -s arguments; returns them as SQL constraints
-def parse_args():
-    if Options["Suite"]:
-        suite_ids_list = [];
-        for suite in string.split(Options["Suite"]):
-            suite_id = db_access.get_suite_id(suite);
-            if suite_id == -1:
-                utils.warn("suite '%s' not recognised." % (suite));
-            else:
-                suite_ids_list.append(suite_id);
-        if suite_ids_list:
-            con_suites = "AND su.id IN (%s)" % string.join(map(str, suite_ids_list), ", ");
-        else:
-            utils.fubar("No valid suite given.");
-    else:
-        con_suites = "";
-
-    if Options["Architecture"]:
-        arch_ids_list = [];
-        check_source = 0;
-        for architecture in string.split(Options["Architecture"]):
-            if architecture == "source":
-                check_source = 1;
-            else:
-                architecture_id = db_access.get_architecture_id(architecture);
-                if architecture_id == -1:
-                    utils.warn("architecture '%s' not recognised." % (architecture));
-                else:
-                    arch_ids_list.append(architecture_id);
-        if arch_ids_list:
-            con_architectures = "AND a.id IN (%s)" % string.join(map(str, arch_ids_list), ", ");
-        else:
-            if not check_source:
-                utils.fubar("No valid architecture given.");
-    else:
-        con_architectures = "";
-        check_source = 1;
-
-    if Options["Component"]:
-        component_ids_list = [];
-        for component in string.split(Options["Component"]):
-            component_id = db_access.get_component_id(component);
-            if component_id == -1:
-                utils.warn("component '%s' not recognised." % (component));
-            else:
-                component_ids_list.append(component_id);
-        if component_ids_list:
-            con_components = "AND su.id IN (%s)" % string.join(map(str, component_ids_list), ", ");
-        else:
-            utils.fubar("No valid component given.");
-    else:
-        con_components = "";
-
-    return (con_suites, con_architectures, con_components, check_source);
-
-################################################################################
-
 def version_cmp(a, b):
     return -apt_pkg.VersionCompare(a[0], b[0]);
 
@@ -347,8 +290,8 @@ def write_filelists(packages, dislocated_files):
         else:
             components = string.split(Options["Components"]);
         udeb_components = Cnf.ValueList("Suite::%s::UdebComponents" % (suite));
-        udeb_components = map(string.lower, udeb_components);
-        for component in map(string.lower, components):
+        udeb_components = udeb_components;
+        for component in components:
             if not d[suite].has_key(component):
                 d[suite][component] = {};
             if component in udeb_components:
@@ -412,7 +355,8 @@ def stable_dislocation_p():
 ################################################################################
 
 def do_da_do_da():
-    (con_suites, con_architectures, con_components, check_source) = parse_args();
+    (con_suites, con_architectures, con_components, check_source) = \
+                 utils.parse_args(Options);
 
     if stable_dislocation_p():
         dislocated_files = claire.find_dislocated_stable(Cnf, projectB);