X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=halle;h=47698ec51373a3ffe781031f4095328d0015c2b9;hb=d0a891d7eb8d79b747f031392dd29de3acd68d84;hp=01f05dd44a62066bcf6ec3a121a6dc1169a451a9;hpb=240185ce8d1003ad7a1a15817d1e0c2ee55675f3;p=dak.git

diff --git a/halle b/halle
index 01f05dd4..47698ec5 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.4 2002-02-12 22:12:44 troup Exp $
+# Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
+# $Id: halle,v 1.8 2002-06-08 00:17:53 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
@@ -49,8 +49,8 @@ Need either changes files or an admin.txt file with a '.joey' suffix."""
 
 def check_changes (filename):
     try:
-        changes = utils.parse_changes(filename, 0)
-        files = utils.build_file_list(changes, "");
+        changes = utils.parse_changes(filename);
+        files = utils.build_file_list(changes);
     except:
         utils.warn("Couldn't read changes file '%s'." % (filename));
         return;
@@ -108,18 +108,18 @@ 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];
+        line = string.rstrip(line)
         if string.find(line, 'install') != -1:
             split_line = string.split(line);
+            if len(split_line) != 2:
+                utils.fubar("Parse error (not exactly 2 elements): %s" % (line));
             install_type = split_line[0];
             if [ "install", "install-u", "sync-install" ].count(install_type) == 0:
                 utils.fubar("Unknown install type ('%s') from: %s" % (install_type, line));
             changes_filename = split_line[1]
-            if len(split_line) != 2:
-                utils.fubar("Parse error (more than 2 elements): %s" % (line));
             if Options["debug"]:
                 print "Processing %s..." % (changes_filename);
             check_changes(changes_filename);
@@ -156,9 +156,10 @@ def main ():
 
     Cnf = utils.get_conf()
 
-    Arguments = [('v',"verbose","Halle::Options::Verbose"),
+    Arguments = [('d', "debug", "Halle::Options::Debug"),
+                 ('v',"verbose","Halle::Options::Verbose"),
                  ('h',"help","Halle::Options::Help")];
-    for i in [ "verbose", "help" ]:
+    for i in [ "debug", "verbose", "help" ]:
 	if not Cnf.has_key("Halle::Options::%s" % (i)):
 	    Cnf["Halle::Options::%s" % (i)] = "";