merge months of changes on ftp-master, see ChangeLog

[dak.git] / halle

diff --git a/halle b/halle
index d218fd20b6418a282b10bfe718e79de37365bab6..655c83de37b7af5fa9d714ad10f6242b456ba5ec 100755 (executable)
--- a/halle
+++ b/halle
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Remove obsolete .changes files from proposed-updates
-# Copyright (C) 2001, 2002  James Troup <james@nocrew.org>
-# $Id: halle,v 1.9 2002-10-16 02:47:32 troup Exp $
+# Copyright (C) 2001, 2002, 2003, 2004  James Troup <james@nocrew.org>
+# $Id: halle,v 1.12 2004-03-11 00:20:51 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
@@ -56,7 +56,7 @@ def check_changes (filename):
         return;
     num_files = len(files.keys());
     for file in files.keys():
-        if utils.re_isadeb.match(file) != None:
+        if utils.re_isadeb.match(file):
             m = re_isdeb.match(file);
             pkg = m.group(1);
             version = m.group(2);
@@ -65,7 +65,7 @@ def check_changes (filename):
                 print "BINARY: %s ==> %s_%s_%s" % (file, pkg, version, arch);
         else:
             m = utils.re_issource.match(file)
-            if m != None:
+            if m:
                 pkg = m.group(1);
                 version = m.group(2);
                 type = m.group(3);
@@ -79,9 +79,13 @@ def check_changes (filename):
             else:
                 utils.fubar("unknown type, fix me");
         if not pu.has_key(pkg):
-            utils.fubar("%s doesn't seem to exist in p-u?? (from %s [%s])" % (pkg, file, filename));
+            # FIXME
+            utils.warn("%s doesn't seem to exist in p-u?? (from %s [%s])" % (pkg, file, filename));
+            continue;
         if not pu[pkg].has_key(arch):
-            utils.fubar("%s doesn't seem to exist for %s in p-u?? (from %s [%s])" % (pkg, arch, file, filename));
+            # FIXME
+            utils.warn("%s doesn't seem to exist for %s in p-u?? (from %s [%s])" % (pkg, arch, file, filename));
+            continue;
         pu_version = utils.re_no_epoch.sub('', pu[pkg][arch]);
         if pu_version == version:
             if Options["verbose"]:
@@ -117,7 +121,7 @@ def check_joey (filename):
             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:
+            if install_type not in [ "install", "install-u", "sync-install" ]:
                 utils.fubar("Unknown install type ('%s') from: %s" % (install_type, line));
             changes_filename = split_line[1]
             if Options["debug"]: