X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=utils.py;h=ca6b9627feafbab6d595429b6d08d44387a0c843;hb=d52ebffcc7af210985d90ffc58e7ecc4141dd8a8;hp=2f42cb39a617f8d794158d45ad964e4e239e62fb;hpb=a0b2b1aafec94c872ddcf2cd21dada1f0ab9240c;p=dak.git

diff --git a/utils.py b/utils.py
index 2f42cb39..ca6b9627 100644
--- a/utils.py
+++ b/utils.py
@@ -1,6 +1,6 @@
 # Utility functions
 # Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.13 2001-01-28 09:06:44 troup Exp $
+# $Id: utils.py,v 1.15 2001-02-25 06:47:27 ajt 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
@@ -23,6 +23,8 @@ re_no_epoch = re.compile(r"^\d*\:")
 re_no_revision = re.compile(r"\-[^-]*$")
 re_arch_from_filename = re.compile(r"/binary-[^/]+/")
 re_extract_src_version = re.compile (r"(\S+)\s*\((.*)\)")
+re_isadeb = re.compile (r'.*\.u?deb$');
+re_issource = re.compile (r'(.+)_(.+?)\.(orig\.tar\.gz|diff\.gz|tar\.gz|dsc)');
 
 changes_parse_error_exc = "Can't parse line in .changes file";
 invalid_dsc_format_exc = "Invalid .dsc file";
@@ -325,6 +327,17 @@ def which_conf_file ():
     else:
         raise unknown_hostname_exc, archive
 
+# FIXME: if the above isn't great, this can't be either :)
+
+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';
+    else:
+        raise unknown_hostname_exc, archive
+
 ######################################################################################
 
 # Escape characters which have meaning to SQL's regex comparison operator ('~')