* katie.py (in_override_p): when searching for a source override, and the...

[dak.git] / halle

diff --git a/halle b/halle
index e3ad2882a87d6874561fd46ee3a4e44e3f320d86..47698ec51373a3ffe781031f4095328d0015c2b9 100755 (executable)
--- a/halle
+++ b/halle
@@ -2,7 +2,7 @@
 
 # Remove obsolete .changes files from proposed-updates
 # Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
-# $Id: halle,v 1.6 2002-05-08 11:13:02 troup Exp $
+# $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;
@@ -111,15 +111,15 @@ def check_joey (filename):
     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);