X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=halle;h=d218fd20b6418a282b10bfe718e79de37365bab6;hb=2e3d931ac7dbf2b90b4571cbd594aeed07f0bd8a;hp=1a16ffe07be36e64d0b6fecd241b88d143bdfdc0;hpb=6213711af5ba0009dd1e5290eeb665f5c51e9fa8;p=dak.git

diff --git a/halle b/halle
index 1a16ffe0..d218fd20 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.5 2002-03-31 16:14:42 troup Exp $
+# Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
+# $Id: halle,v 1.9 2002-10-16 02:47:32 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,7 +20,7 @@
 
 ################################################################################
 
-import os, pg, re, sys, string;
+import os, pg, re, sys;
 import utils, db_access;
 import apt_pkg;
 
@@ -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;
@@ -71,7 +71,7 @@ def check_changes (filename):
                 type = m.group(3);
                 if type != "dsc":
                     del files[file];
-                    num_files = num_files - 1;
+                    num_files -= 1;
                     continue;
                 arch = "source";
                 if Options["debug"]:
@@ -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];
-        if string.find(line, 'install') != -1:
-            split_line = string.split(line);
+        line = line.rstrip();
+        if line.find('install') != -1:
+            split_line = line.split();
+            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);
@@ -177,9 +177,9 @@ def main ():
     init_pu();
 
     for file in arguments:
-        if file[-8:] == ".changes":
+        if file.endswith(".changes"):
             check_changes(file);
-        elif file[-5:] == ".joey":
+        elif file.endswith(".joey"):
             check_joey(file);
         else:
             utils.fubar("Unrecognised file type: '%s'." % (file));