handle a mlf without a preceeding slf

[dak.git] / utils.py

diff --git a/utils.py b/utils.py
index 5089f203710a7e7b33e01a2d2add408d5c0abfcb..f6b9e15a60dc6e4db66d33cc7060c9256a9572bc 100644 (file)
--- 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.49 2002-07-12 15:09: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
@@ -29,7 +29,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 +144,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 +178,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,6 +533,11 @@ def validate_changes_file_arg(file, fatal=1):
 
 ################################################################################
 
+def real_arch(arch):
+    return (arch != "source" and arch != "all");
+
+################################################################################
+
 def get_conf():
        return Cnf;