jennifer: re-enable ar check, cope with broken Changed-By fields

diff --git a/ChangeLog b/ChangeLog
index 87c107778e55effdaff52b81815741546ad94e20..5dbb89298b5df99b12985ee803241459df8ad3ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-25  Anthony Towns  <aj@erisian.com.au>
+
+       * jennifer: If changed-by parsing fails, set variables to "" so REJECT
+       works
+       * jennifer: Re-enable .deb ar format checking
+
 2005-11-15  Anthony Towns  <aj@erisian.com.au>
 
        * Merge of changes from spohr, by various people.

diff --git a/jennifer b/jennifer
index 92055bf28cfcb245c523ad07f6fc1b2feee74a2f..c19e1ec545a0b9a5d739b8a9a30d738f8ad2f45c 100755 (executable)
--- a/jennifer
+++ b/jennifer
@@ -2,7 +2,7 @@
 
 # Checks Debian packages from Incoming
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005  James Troup <james@nocrew.org>
-# $Id: jennifer,v 1.57 2005-11-15 09:50:32 ajt Exp $
+# $Id: jennifer,v 1.58 2005-11-24 15:40:16 ajt 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
@@ -45,7 +45,7 @@ re_strip_revision = re.compile(r"-([^-]+)$");
 ################################################################################
 
 # Globals
-jennifer_version = "$Revision: 1.57 $";
+jennifer_version = "$Revision: 1.58 $";
 
 Cnf = None;
 Options = None;
@@ -230,6 +230,9 @@ def check_changes():
          changes["changedbyname"], changes["changedbyemail"]) = \
          utils.fix_maintainer (changes.get("changed-by", ""));
     except utils.ParseMaintError, msg:
+        (changes["changedby822"], changes["changedby2047"],
+         changes["changedbyname"], changes["changedbyemail"]) = \
+        ("", "", "", "")
         reject("%s: Changed-By field ('%s') failed to parse: %s" \
                % (filename, changes["changed-by"], msg));
 
@@ -535,8 +538,7 @@ def check_files():
             # Check the version and for file overwrites
             reject(Katie.check_binary_against_db(file),"");
 
-           # [JT - 2005/05/31; disabled for now, will go back on post-sarge]
-            #check_deb_ar(file, control)
+            check_deb_ar(file, control)
 
         # Checks for a source package...
         else: