X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils.py;h=1c00a1cbb9ec87bede691846e265974e07e955c7;hb=9a529dd9de83f8b7125cc455a3da132091566387;hp=ae796855e959922ee40607e775c839decdbd6fd2;hpb=c7b840eb35df5110f6e042168f6cd9b5a03d96f3;p=dak.git

diff --git a/utils.py b/utils.py
index ae796855..1c00a1cb 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.24 2001-05-31 02:19:30 troup Exp $
+# $Id: utils.py,v 1.26 2001-06-10 16:35:03 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
@@ -43,6 +43,17 @@ cant_open_exc = "Can't read file.";
 unknown_hostname_exc = "Unknown hostname";
 cant_overwrite_exc = "Permission denied; can't overwrite existent file."
 file_exists_exc = "Destination file exists";
+send_mail_invalid_args_exc = "Both arguments are non-null.";
+sendmail_failed_exc = "Sendmail invocation failed";
+
+# 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": ""
+    };
 
 ######################################################################################
 
@@ -75,7 +86,9 @@ def str_isnum (s):
 
 ######################################################################################
 
-# 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 = "";
     
@@ -83,15 +96,23 @@ def extract_component_from_section(section):
         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);
@@ -256,22 +277,23 @@ def send_mail (message, filename):
 
 	# Sanity check arguments
 	if message != "" and filename != "":
-		sys.stderr.write ("send_mail() can't be called with both arguments as non-null! (`%s' and `%s')\n%s" % (message, filename))
-		sys.exit(1)
+            raise send_mail_invalid_args_exc;
+
 	# If we've been passed a string dump it into a temporary file
 	if message != "":
-		filename = tempfile.mktemp()
-		fd = os.open(filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0700)
-		os.write (fd, message)
-		os.close (fd)
+            filename = tempfile.mktemp();
+            fd = os.open(filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0700);
+            os.write (fd, message);
+            os.close (fd);
+
 	# Invoke sendmail
-	(result, output) = commands.getstatusoutput("%s < %s" % (sendmail_command, filename))
+	(result, output) = commands.getstatusoutput("%s < %s" % (sendmail_command, filename));
 	if (result != 0):
-		sys.stderr.write ("Sendmail invocation (`%s') failed for `%s'!\n%s" % (sendmail_command, filename, output))
-		sys.exit(result)
+            raise sendmail_failed_exc, output;
+
 	# Clean up any temporary files
 	if message !="":
-		os.unlink (filename)
+            os.unlink (filename);
 
 ######################################################################################