Non-US doesn't have experimental yet.

[dak.git] / utils.py

diff --git a/utils.py b/utils.py
index a40133f4ea88cbecdb2a111e142ce820ea9b96e2..0422e08d3de7abc1c1c102eda754ad5684463a5e 100644 (file)
--- 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.14 2001-02-04 04:28:34 troup Exp $
+# $Id: utils.py,v 1.16 2001-03-02 02:45:01 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
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import commands, os, re, socket, shutil, stat, string, sys, tempfile
+import commands, os, re, socket, shutil, stat, string, sys, tempfile, apt_pkg
 
 re_comments = re.compile(r"\#.*")
 re_no_epoch = re.compile(r"^\d*\:")
@@ -57,6 +57,16 @@ def our_raw_input():
 
 ######################################################################################
 
+# Obsoleted by python >= 1.6
+
+def str_isnum (s):
+    for c in s:
+        if c not in string.digits:
+            return 0;
+    return 1;
+
+######################################################################################
+
 # What a mess.  FIXME
 def extract_component_from_section(section):
     component = "";
@@ -99,6 +109,9 @@ def parse_changes(filename, dsc_whitespace_rules):
     changes = {};
     lines = changes_in.readlines();
 
+    if lines == []:
+       raise changes_parse_error_exc, "[Empty changes file]";
+
     # Reindex by line number so we can easily verify the format of
     # .dsc files...
     index = 0;
@@ -327,6 +340,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 ('~')