# Utility functions
# Copyright (C) 2000, 2001 James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.28 2001-07-07 03:10:51 troup Exp $
+# $Id: utils.py,v 1.33 2001-09-26 03:49:16 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]+)\>");
"non-free": ""
};
+default_config = "/etc/katie/katie.conf";
+default_apt_config = "/etc/katie/apt.conf";
+DefaultCnf = apt_pkg.newConfiguration();
+apt_pkg.ReadConfigFileISC(DefaultCnf,default_config);
+
######################################################################################
-def open_file(filename, mode):
+def open_file(filename, mode='r'):
try:
f = open(filename, mode);
except IOError:
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 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
######################################################################################
-# FIXME: this is inherently nasty. Can't put this mapping in a conf
-# file because the conf file depends on the archive.. doh. Maybe an
-# archive independent conf file is needed.
-
def where_am_i ():
res = socket.gethostbyaddr(socket.gethostname());
- if res[0] == 'pandora.debian.org':
- return 'non-US';
- elif res[0] == 'auric.debian.org':
- return 'ftp-master';
+ if DefaultCnf.get("Config::" + res[0] + "::DatbaseHostname"):
+ return DefaultCnf["Config::" + res[0] + "::DatabaseHostname"]
else:
- raise unknown_hostname_exc, res;
-
-######################################################################################
-
-# FIXME: this isn't great either.
+ return res[0];
def which_conf_file ():
- archive = where_am_i ();
- if archive == 'non-US':
- return '/org/non-us.debian.org/katie/katie.conf-non-US';
- elif archive == 'ftp-master':
- return '/org/ftp.debian.org/katie/katie.conf';
+ res = socket.gethostbyaddr(socket.gethostname());
+ if DefaultCnf.get("Config::" + res[0] + "::KatieConfig"):
+ return DefaultCnf["Config::" + res[0] + "::KatieConfig"]
else:
- raise unknown_hostname_exc, archive
-
-# FIXME: if the above isn't great, this can't be either :)
+ return default_config;
def which_apt_conf_file ():
- archive = where_am_i ();
- if archive == 'non-US':
- return '/org/non-us.debian.org/katie/apt.conf-non-US';
- elif archive == 'ftp-master':
- return '/org/ftp.debian.org/katie/apt.conf';
+ res = socket.gethostbyaddr(socket.gethostname());
+ if DefaultCnf.get("Config::" + res[0] + "::AptConfig"):
+ return DefaultCnf["Config::" + res[0] + "::AptConfig"]
else:
- raise unknown_hostname_exc, archive
+ return default_apt_config;
######################################################################################
######################################################################################
-# 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);
if extra >= too_many:
raise tried_too_hard_exc;
return dest;
-
+
+################################################################################
+
+def result_join (original, sep = '\t'):
+ list = [];
+ for i in xrange(len(original)):
+ if original[i] == None:
+ list.append("");
+ else:
+ list.append(original[i]);
+ return string.join(list, sep);
+
################################################################################
projects / dak.git / blobdiff