# Utility functions
-# Copyright (C) 2000 James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.25 2001-06-01 00:17:45 troup Exp $
+# Copyright (C) 2000, 2001 James Troup <james@nocrew.org>
+# $Id: utils.py,v 1.31 2001-09-13 23:52:37 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
re_isadeb = re.compile (r".*\.u?deb$");
re_issource = re.compile (r"(.+)_(.+?)\.(orig\.tar\.gz|diff\.gz|tar\.gz|dsc)");
-re_begin_pgp_signature = re.compile("^-----BEGIN PGP SIGNATURE");
-re_begin_pgp_signed_msg = re.compile("^-----BEGIN PGP SIGNED MESSAGE");
re_single_line_field = re.compile(r"^(\S*)\s*:\s*(.*)");
-re_multi_line_description = re.compile(r"^ \.$");
re_multi_line_field = re.compile(r"^\s(.*)");
re_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\> \t]+)\>");
file_exists_exc = "Destination file exists";
send_mail_invalid_args_exc = "Both arguments are non-null.";
sendmail_failed_exc = "Sendmail invocation failed";
+tried_too_hard_exc = "Tried too hard to find a free filename.";
+
+# Valid components; used by extract_component_from_section() because
+# it doesn't know about Conf from it's caller. FIXME
+
+valid_components = {
+ "main": "",
+ "contrib": "",
+ "non-free": ""
+ };
######################################################################################
-def open_file(filename, mode):
+def open_file(filename, mode='r'):
try:
f = open(filename, mode);
except IOError:
######################################################################################
-# What a mess. FIXME
+# Prefix and components hardcoded into this like a good'un; need to unhardcod at some
+# stage. [FIXME]
+
def extract_component_from_section(section):
component = "";
-
- if string.find(section, '/') != -1:
+
+ if string.find(section, '/') != -1:
component = string.split(section, '/')[0];
if string.lower(component) == "non-us" and string.count(section, '/') > 0:
s = string.split(section, '/')[1];
- if s == "main" or s == "non-free" or s == "contrib": # Avoid e.g. non-US/libs
+ if valid_components.has_key(s): # Avoid e.g. non-US/libs
component = string.split(section, '/')[0]+ '/' + string.split(section, '/')[1];
if string.lower(section) == "non-us":
component = "non-US/main";
-
+
+ # non-US prefix is case insensitive
+ if string.lower(component)[:6] == "non-us":
+ component = "non-US"+component[6:];
+
+ # Expand default component
if component == "":
- component = "main";
- elif string.lower(component) == "non-us":
+ if valid_components.has_key(section):
+ component = section;
+ else:
+ component = "main";
+ elif component == "non-US":
component = "non-US/main";
return (section, component);
if index > max(indices):
raise invalid_dsc_format_exc, index;
line = indexed_lines[index];
- if not re_begin_pgp_signature.match(line):
+ if line[:24] != "-----BEGIN PGP SIGNATURE":
raise invalid_dsc_format_exc, index;
inside_signature = 0;
break;
- if re_begin_pgp_signature.match(line):
+ if line[:24] == "-----BEGIN PGP SIGNATURE":
break;
- if re_begin_pgp_signed_msg.match(line):
+ if line[:29] == "-----BEGIN PGP SIGNED MESSAGE":
if dsc_whitespace_rules:
inside_signature = 1;
while index < max(indices) and line != "":
changes[field] = slf.groups()[1];
first = 1;
continue;
- mld = re_multi_line_description.match(line);
- if mld:
+ if line == " .":
changes[field] = changes[field] + '\n';
continue;
mlf = re_multi_line_field.match(line);
if dsc_whitespace_rules and inside_signature:
raise invalid_dsc_format_exc, index;
-
+
changes_in.close();
changes["filecontents"] = string.join (lines, "");
if format != "":
format = float(format)
if dsc == "" and (format < 1.5 or format > 2.0):
- raise nk_format_exc, changes["format"];
+ raise nk_format_exc, format;
# No really, this has happened. Think 0 length .dsc file.
if not changes.has_key("files"):
raise no_files_exc
-
+
for i in string.split(changes["files"], "\n"):
if i == "":
break
if priority == "": priority = "-"
(section, component) = extract_component_from_section(section);
-
+
files[name] = { "md5sum" : md5,
"size" : size,
"section": section,
# 06:28|<Culus> 'The standard sucks, but my tool is supposed to
# interoperate with it. I know - I'll fix the suckage
# and make things incompatible!'
-
+
def fix_maintainer (maintainer):
m = re_parse_maintainer.match(maintainer);
rfc822 = maintainer
######################################################################################
-# Perform a substition of template
+# Perform a substition of template
def TemplateSubst(Map,Template):
for x in Map.keys():
Template = string.replace(Template,x,Map[x]);
def changes_compare (a, b):
try:
a_changes = parse_changes(a, 0)
- except changes_parse_error_exc, line:
+ except:
return -1;
try:
b_changes = parse_changes(b, 0)
- except changes_parse_error_exc, line:
+ except:
return 1;
-
+
cc_fix_changes (a_changes);
cc_fix_changes (b_changes);
return 1;
# Sort by source name
-
+
a_source = a_changes.get("source");
b_source = b_changes.get("source");
q = cmp (a_source, b_source);
return cmp(a, b);
################################################################################
+
+def find_next_free (dest, too_many=100):
+ extra = 0;
+ orig_dest = dest;
+ while os.path.exists(dest) and extra < too_many:
+ dest = orig_dest + '.' + repr(extra);
+ extra = extra + 1;
+ if extra >= too_many:
+ raise tried_too_hard_exc;
+ return dest;
+
+################################################################################