X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils.py;h=fb32bc237926cccb571936cb35b5a739bb8e4e7f;hb=b5d32f0b8626ba2ddc832ba32fa5dd805abc8a7e;hp=5089f203710a7e7b33e01a2d2add408d5c0abfcb;hpb=45c61f94d3f6625c1f1074549ea677d81bd15c4d;p=dak.git

diff --git a/utils.py b/utils.py
index 5089f203..fb32bc23 100644
--- a/utils.py
+++ b/utils.py
@@ -1,6 +1,6 @@
 # Utility functions
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.46 2002-05-23 12:36:15 troup Exp $
+# $Id: utils.py,v 1.50 2002-07-14 15:01:04 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
@@ -16,8 +16,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import commands, os, pwd, re, socket, shutil, string, sys, tempfile
-import apt_pkg
+################################################################################
+
+import commands, os, pwd, re, socket, shutil, string, sys, tempfile;
+import apt_pkg;
+import db_access;
+
+################################################################################
 
 re_comments = re.compile(r"\#.*")
 re_no_epoch = re.compile(r"^\d*\:")
@@ -29,7 +34,7 @@ re_issource = re.compile (r"(.+)_(.+?)\.(orig\.tar\.gz|diff\.gz|tar\.gz|dsc)$");
 
 re_single_line_field = re.compile(r"^(\S*)\s*:\s*(.*)");
 re_multi_line_field = re.compile(r"^\s(.*)");
-re_taint_free = re.compile(r"^[-+\.\w]+$");
+re_taint_free = re.compile(r"^[-+~\.\w]+$");
 
 re_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\> \t]+)\>");
 
@@ -144,6 +149,7 @@ def parse_changes(filename, dsc_whitespace_rules=0):
 
     indices = indexed_lines.keys()
     index = 0;
+    first = -1;
     while index < max(indices):
         index = index + 1;
         line = indexed_lines[index];
@@ -177,6 +183,8 @@ def parse_changes(filename, dsc_whitespace_rules=0):
             continue;
         mlf = re_multi_line_field.match(line);
         if mlf:
+            if first == -1:
+                raise changes_parse_error_exc, "'%s'\n [Multi-line field continuing on from nothing?]" % (line);
             if first == 1 and changes[field] != "":
                 changes[field] = changes[field] + '\n';
             first = 0;
@@ -530,11 +538,83 @@ def validate_changes_file_arg(file, fatal=1):
 
 ################################################################################
 
+def real_arch(arch):
+    return (arch != "source" and arch != "all");
+
+################################################################################
+
+def join_with_commas_and(list):
+	if len(list) == 0: return "nothing";
+	if len(list) == 1: return list[0];
+	return string.join(list[:-1], ", ") + " and " + list[-1];
+
+################################################################################
+
 def get_conf():
 	return Cnf;
 
 ################################################################################
 
+# Handle -a, -c and -s arguments; returns them as SQL constraints
+def parse_args(Options):
+    # Process suite
+    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:
+            fubar("No valid suite given.");
+    else:
+        con_suites = "";
+
+    # Process component
+    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:
+                warn("component '%s' not recognised." % (component));
+            else:
+                component_ids_list.append(component_id);
+        if component_ids_list:
+            con_components = "AND c.id IN (%s)" % string.join(map(str, component_ids_list), ", ");
+        else:
+            fubar("No valid component given.");
+    else:
+        con_components = "";
+
+    # Process architecture
+    con_architectures = "";
+    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:
+                    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:
+                fubar("No valid architecture given.");
+    else:
+        check_source = 1;
+
+    return (con_suites, con_architectures, con_components, check_source);
+
+################################################################################
+
 apt_pkg.init()
 
 Cnf = apt_pkg.newConfiguration();