sync

[dak.git] / catherine

diff --git a/catherine b/catherine
index 573d57e7550af4c6a130b5d055724c52a62609ae..09a92ab9b85fb8ce270d7a26c181caa7d60aab6b 100755 (executable)
--- a/catherine
+++ b/catherine
@@ -2,7 +2,7 @@
 
 # Poolify (move packages from "legacy" type locations to pool locations)
 # Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: catherine,v 1.1 2000-11-24 00:20:11 troup Exp $
+# $Id: catherine,v 1.2 2001-01-31 03:36:36 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
@@ -18,6 +18,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+# "Welcome to where time stands still,
+#  No one leaves and no one will."
+#   - Sanitarium - Metallica / Master of the puppets
+
 ################################################################################
 
 import pg
@@ -39,42 +43,17 @@ def main ():
     Cnf = apt_pkg.newConfiguration();
     apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
 
-    Arguments = [('d',"debug","Heidi::Options::Debug", "IntVal"),
+    Arguments = [('D',"debug","Heidi::Options::Debug", "IntVal"),
                  ('h',"help","Heidi::Options::Help"),
-                 ('v',"version","Heidi::Options::Version")];
+                 ('V',"version","Heidi::Options::Version")];
 
     amount = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
-    print amount
-    
-    return
-
     projectB = pg.connect('projectb', 'localhost');
-
     db_access.init(Cnf, projectB);
 
-    if (Cnf["Heidi::Options::Add"] == "" and Cnf["Heidi::Options::Remove"] == "") or (Cnf["Heidi::Options::Add"] != "" and Cnf["Heidi::Options::Remove"] != ""):
-
-        sys.stderr.write("Need either --add <suite> or --remove <suite> command line argument; not neither or both.\n");
-        sys.exit(2);
-
-    for i in ("add", "remove"):
-        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);
-            else:
-                suite_id = db_access.get_suite_id(suite);
-                action = i;
-
-    if file_list != []:
-        for file in file_list:
-            process_file(utils.open_file(file_list[0],'r'), suite_id, action);
-    else:
-        process_file(sys.stdin, suite_id, action);
-
-    db_access.init (Cnf, projectB);
+    
+    
 
 #######################################################################################