#!/usr/bin/env python
# Utility functions
-# Copyright (C) 2000, 2001, 2002, 2003 James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.59 2003-09-24 00:13:43 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003, 2004 James Troup <james@nocrew.org>
+# $Id: utils.py,v 1.64 2004-03-11 00:20:51 troup Exp $
################################################################################
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."
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;
inside_signature = 0;
- indices = indexed_lines.keys()
+ num_of_lines = len(indexed_lines.keys());
index = 0;
first = -1;
- while index < max(indices):
+ while index < num_of_lines:
index += 1;
line = indexed_lines[index];
if line == "":
if dsc_whitespace_rules:
index += 1;
- if index > max(indices):
+ if index > num_of_lines:
raise invalid_dsc_format_exc, index;
line = indexed_lines[index];
if not line.startswith("-----BEGIN PGP SIGNATURE"):
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 < max(indices) and line != "":
+ 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();
rfc822 = maintainer;
name = "";
email = "";
- if m != None and len(m.groups()) == 2:
+ if m and len(m.groups()) == 2:
name = m.group(1);
email = m.group(2);
if name.find(',') != -1 or name.find('.') != -1: