X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=halle;h=e3ad2882a87d6874561fd46ee3a4e44e3f320d86;hb=b51815ac34b619062cff7a6633ad43e6af255917;hp=06f42a650e6fd7c6543b55d56855d8777af05bad;hpb=c1c7681bf43c58dd5cf34d1c1814a75ae594688b;p=dak.git

diff --git a/halle b/halle
index 06f42a65..e3ad2882 100755
--- a/halle
+++ b/halle
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Remove obsolete .changes files from proposed-updates
-# Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: halle,v 1.2 2001-11-04 22:28:44 troup Exp $
+# Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
+# $Id: halle,v 1.6 2002-05-08 11:13:02 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
@@ -20,20 +20,32 @@
 
 ################################################################################
 
-import os, pg, re, sys, string
-import utils, db_access
-import apt_pkg, apt_inst;
+import os, pg, re, sys, string;
+import utils, db_access;
+import apt_pkg;
 
 ################################################################################
 
 Cnf = None;
 projectB = None;
+Options = None;
 pu = {};
 
 re_isdeb = re.compile (r"^(.+)_(.+?)_(.+?).deb$");
 
 ################################################################################
 
+def usage (exit_code=0):
+    print """Usage: halle [OPTION] <CHANGES FILE | ADMIN FILE>[...]
+Remove obsolete changes files from proposed-updates.
+
+  -v, --verbose              be more verbose about what is being done
+  -h, --help                 show this help and exit
+
+Need either changes files or an admin.txt file with a '.joey' suffix."""
+    sys.exit(exit_code)
+
+################################################################################
 
 def check_changes (filename):
     try:
@@ -44,8 +56,6 @@ def check_changes (filename):
         return;
     num_files = len(files.keys());
     for file in files.keys():
-        re_isadeb = re.compile (r".*\.u?deb$");
-
         if utils.re_isadeb.match(file) != None:
             m = re_isdeb.match(file);
             pkg = m.group(1);
@@ -98,7 +108,7 @@ def check_joey (filename):
     file = utils.open_file(filename);
 
     cwd = os.getcwd();
-    os.chdir("%s/dists/proposed-updates" % (Cnf["Dir::RootDir"]));
+    os.chdir("%s/dists/proposed-updates" % (Cnf["Dir::Root"]));
 
     for line in file.readlines():
         line = line[:-1];
@@ -144,18 +154,14 @@ ORDER BY package, version, arch_string;
 def main ():
     global Cnf, projectB, Options;
 
-    apt_pkg.init();
-
-    Cnf = apt_pkg.newConfiguration();
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file());
+    Cnf = utils.get_conf()
 
-    Arguments = [('q',"quiet","Halle::Options::Quiet"),
+    Arguments = [('d', "debug", "Halle::Options::Debug"),
                  ('v',"verbose","Halle::Options::Verbose"),
-                 ('D',"debug","Halle::Options::Debug"),
-                 ('h',"help","Halle::Options::Help"),
-                 ('V',"version","Halle::Options::Version")];
-    for i in [ "quiet", "verbose", "help", "debug" ]:
-        Cnf["Halle::Options::%s" % (i)] = "";
+                 ('h',"help","Halle::Options::Help")];
+    for i in [ "debug", "verbose", "help" ]:
+	if not Cnf.has_key("Halle::Options::%s" % (i)):
+	    Cnf["Halle::Options::%s" % (i)] = "";
 
     arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
     Options = Cnf.SubTree("Halle::Options")