string.find rather than slices, == [] removal and second open_file argument removal

[dak.git] / utils.py

diff --git a/utils.py b/utils.py
index 2de33f1ea051b95a9266b15e03786973fa311863..97598f98ea8aa93c0b547262d7441113662e69dd 100644 (file)
--- a/utils.py
+++ b/utils.py
@@ -1,6 +1,6 @@
 # Utility functions
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.32 2001-09-17 11:18:37 troup Exp $
+# $Id: utils.py,v 1.35 2001-11-04 22:33:22 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,6 +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_parse_maintainer = re.compile(r"^\s*(\S.*\S)\s*\<([^\> \t]+)\>");
 
@@ -53,6 +54,11 @@ valid_components = {
     "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='r'):
@@ -62,6 +68,10 @@ def open_file(filename, mode='r'):
         raise cant_open_exc, filename
     return f
 
+def touch_file(filename):
+    fd = os.open(filename, os.O_RDONLY | os.O_CREAT);
+    os.close(fd);
+
 ######################################################################################
 
 # From reportbug
@@ -131,12 +141,12 @@ def extract_component_from_section(section):
 #   "-----BEGIN PGP SIGNATURE-----".
 
 def parse_changes(filename, dsc_whitespace_rules):
-    changes_in = open_file(filename,'r');
+    changes_in = open_file(filename);
     error = "";
     changes = {};
     lines = changes_in.readlines();
 
-    if lines == []:
+    if not lines:
        raise changes_parse_error_exc, "[Empty changes file]";
 
     # Reindex by line number so we can easily verify the format of
@@ -160,13 +170,13 @@ def parse_changes(filename, dsc_whitespace_rules):
                 if index > max(indices):
                     raise invalid_dsc_format_exc, index;
                 line = indexed_lines[index];
-                if line[:24] != "-----BEGIN PGP SIGNATURE":
+                if string.find(line, "-----BEGIN PGP SIGNATURE") != 0:
                     raise invalid_dsc_format_exc, index;
                 inside_signature = 0;
                 break;
-        if line[:24] == "-----BEGIN PGP SIGNATURE":
+        if string.find(line, "-----BEGIN PGP SIGNATURE") == 0:
             break;
-        if line[:29] == "-----BEGIN PGP SIGNED MESSAGE":
+        if string.find(line, "-----BEGIN PGP SIGNED MESSAGE") == 0:
             if dsc_whitespace_rules:
                 inside_signature = 1;
                 while index < max(indices) and line != "":
@@ -354,42 +364,27 @@ def copy (src, dest, overwrite = 0):
 
 ######################################################################################
 
-# 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';
+    database_hostname = DefaultCnf.get("Config::" + res[0] + "::DatabaseHostname");
+    if database_hostname:
+       return database_hostname;
     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;
 
 ######################################################################################