fix bogus reject on warnings by not prefixing reject strings from check_dsc_against_d...

[dak.git] / fernanda.py

diff --git a/fernanda.py b/fernanda.py
index 728ab73379594365a9fc75bb2aeea366c2c65060..0de0234be1522e147c79b5e216cb2c14aebfd108 100755 (executable)
--- a/fernanda.py
+++ b/fernanda.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Script to automate some parts of checking NEW packages
-# Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: fernanda.py,v 1.1 2002-02-12 23:08:07 troup Exp $
+# Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
+# $Id: fernanda.py,v 1.4 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
@@ -90,7 +90,7 @@ def check_dsc (dsc_filename):
 def check_deb (deb_filename):
     filename = os.path.basename(deb_filename);
 
-    if filename[-5:] == ".udeb":
+    if filename.endswith(".udeb"):
        is_a_udeb = 1;
     else:
        is_a_udeb = 0;
@@ -128,12 +128,12 @@ def display_changes (changes_filename):
 def check_changes (changes_filename):
     display_changes(changes_filename);
 
-    changes = utils.parse_changes (changes_filename, 0);
-    files = utils.build_file_list(changes, "");
+    changes = utils.parse_changes (changes_filename);
+    files = utils.build_file_list(changes);
     for file in files.keys():
-       if file[-4:] == ".deb" or file[-5:] == ".udeb":
+       if file.endswith(".deb") or file.endswith(".udeb"):
            check_deb(file);
-        if file[-4:] == ".dsc":
+        if file.endswith(".dsc"):
             check_dsc(file);
         # else: => byhand
 
@@ -162,11 +162,11 @@ def main ():
             sys.stdout = less_fd;
 
             try:
-                if file[-8:] == ".changes":
+                if file.endswith(".changes"):
                     check_changes(file);
-                elif file[-4:] == ".deb" or file[-5:] == ".udeb":
+                elif file.endswith(".deb") or file.endswith(".udeb"):
                     check_deb(file);
-                elif file[-4:] == ".dsc":
+                elif file.endswith(".dsc"):
                     check_dsc(file);
                 else:
                     utils.fubar("Unrecognised file type: '%s'." % (file));