X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils.py;h=9b3ab2a1af6977352c74e2ec97cda16ee2384de7;hb=5fed805777228403024d131fb189a1a1b2d53c34;hp=af196e572b3958d4b2f54dada403a4c188ecc5a3;hpb=9a6ed8b073b00ab14baa23cf1ee75c51c52a66c1;p=dak.git

diff --git a/utils.py b/utils.py
index af196e57..9b3ab2a1 100644
--- a/utils.py
+++ b/utils.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Utility functions
-# Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.60 2003-11-17 17:59:29 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
+# $Id: utils.py,v 1.63 2004-02-27 20:07:40 troup Exp $
 
 ################################################################################
 
@@ -45,7 +45,7 @@ re_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\> \t]+)\>");
 changes_parse_error_exc = "Can't parse line in .changes file";
 invalid_dsc_format_exc = "Invalid .dsc file";
 nk_format_exc = "Unknown Format: in .changes file";
-no_files_exc = "No Files: field in .dsc file.";
+no_files_exc = "No Files: field in .dsc or .changes file.";
 cant_open_exc = "Can't read file.";
 unknown_hostname_exc = "Unknown hostname";
 cant_overwrite_exc = "Permission denied; can't overwrite existent file."
@@ -93,7 +93,7 @@ def extract_component_from_section(section):
 
     if section.find('/') != -1:
         component = section.split('/')[0];
-    if component.lower() == "non-us" and section.count('/') > 0:
+    if component.lower() == "non-us" and section.find('/') != -1:
         s = component + '/' + section.split('/')[1];
         if Cnf.has_key("Component::%s" % s): # Avoid e.g. non-US/libs
             component = s;
@@ -176,12 +176,15 @@ def parse_changes(filename, dsc_whitespace_rules=0):
         if line.startswith("-----BEGIN PGP SIGNATURE"):
             break;
         if line.startswith("-----BEGIN PGP SIGNED MESSAGE"):
+            inside_signature = 1;
             if dsc_whitespace_rules:
-                inside_signature = 1;
                 while index < num_of_lines and line != "":
                     index += 1;
                     line = indexed_lines[index];
             continue;
+        # If we're not inside the signed data, don't process anything
+        if not inside_signature:
+            continue;
         slf = re_single_line_field.match(line);
         if slf:
             field = slf.groups()[0].lower();