make use of utils.{warn,fubar}. clean up extraneous \n's in fernanda and natalie...

[dak.git] / heidi

diff --git a/heidi b/heidi
index 959061032608a4b77c1fb6721c1e795c1d5c7873..9dff02447a58b21fbcad8879c08dcfa88c82209c 100755 (executable)
--- a/heidi
+++ b/heidi
@@ -2,7 +2,7 @@
 
 # Manipulate suite tags
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: heidi,v 1.6 2001-06-20 18:47:37 troup Exp $
+# $Id: heidi,v 1.7 2001-06-22 22:53:14 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
@@ -67,7 +67,7 @@ def process_file (file, suite_id, action):
     for line in lines:
         split_line = string.split(string.strip(line[:-1]));
         if len(split_line) != 3:
-            sys.stderr.write("W: '%s' does not break into 'package version architecture'.\n" % (line[:-1]));
+            utils.warn("'%s' does not break into 'package version architecture'." % (line[:-1]));
             continue;
         
         (package, version, architecture) = split_line;
@@ -79,10 +79,10 @@ def process_file (file, suite_id, action):
 
         ql = q.getresult();
         if ql == []:
-            sys.stderr.write("W: Couldn't find '%s~%s~%s'.\n" % (package, version, architecture));
+            utils.warn("Couldn't find '%s~%s~%s'." % (package, version, architecture));
             continue;
         if len(ql) > 1:
-            sys.stderr.write("E: Found more than one match for '%s~%s~%s'.\n" % (package, version, architecture));
+            utils.warn("Found more than one match for '%s~%s~%s'." % (package, version, architecture));
             continue;
         id = ql[0][0];
 
@@ -97,13 +97,13 @@ def process_file (file, suite_id, action):
             # Take action
             if action == "add":
                 if assoication_id != None:
-                    sys.stderr.write("W: '%s~%s~%s' already exists in suite %s.\n" % (package, version, architecture, suite_id));
+                    utils.warn("'%s~%s~%s' already exists in suite %s." % (package, version, architecture, suite_id));
                     continue;
                 else:
                     q = projectB.query("INSERT INTO src_associations (suite, source) VALUES (%s, %s)" % (suite_id, id));
             elif action == "remove":
                 if assoication_id == None:
-                    sys.stderr.write("W: '%s~%s~%s' doesn't exist in suite %s.\n" % (package, version, architecture, suite_id));
+                    utils.warn("'%s~%s~%s' doesn't exist in suite %s." % (package, version, architecture, suite_id));
                     continue;
                 else:
                     q = projectB.query("DELETE FROM src_associations WHERE id = %s" % (assoication_id));
@@ -118,13 +118,13 @@ def process_file (file, suite_id, action):
             # Take action
             if action == "add":
                 if assoication_id != None:
-                    sys.stderr.write("W: '%s~%s~%s' already exists in suite %s.\n" % (package, version, architecture, suite_id));
+                    utils.warn("'%s~%s~%s' already exists in suite %s." % (package, version, architecture, suite_id));
                     continue;
                 else:
                     q = projectB.query("INSERT INTO bin_associations (suite, bin) VALUES (%s, %s)" % (suite_id, id));
             elif action == "remove":
                 if assoication_id == None:
-                    sys.stderr.write("W: '%s~%s~%s' doesn't exist in suite %s.\n" % (package, version, architecture, suite_id));
+                    utils.warn("'%s~%s~%s' doesn't exist in suite %s." % (package, version, architecture, suite_id));
                     continue;
                 else:
                     q = projectB.query("DELETE FROM bin_associations WHERE id = %s" % (assoication_id));
@@ -176,24 +176,20 @@ def main ():
         suite = Cnf["Heidi::Options::%s" % (i)];
         if suite !="":
             if not Cnf.has_key("Suite::%s" % (suite)):
-                sys.stderr.write("Unknown suite %s.\n" %(suite));
-                sys.exit(2);
+                utils.fubar("Unknown suite '%s'." %(suite));
             else:
                 suite_id = db_access.get_suite_id(suite);
                 if action != None:
-                    sys.stderr.write("Can only do one action at a time.\n");
-                    sys.exit(2);
+                    utils.fubar("Can only perform one action at a time.");
                 action = i;
 
     # Need an action...
     if action == None:
-        sys.stderr.write("No action specified.\n");
-        sys.exit(2);
+        utils.fubar("No action specified.");
 
     # Safety/Sanity check
     if action == "set" and suite != "testing":
-        sys.stderr.write("Will not reset a suite other than testing...\n");
-        sys.exit(2);
+        utils.fubar("Will not reset a suite other than testing.");
 
     if action == "list":
         get_list(suite_id);