From: Anthony Towns Date: Thu, 24 Nov 2005 15:40:16 +0000 (+0000) Subject: jennifer: re-enable ar check, cope with broken Changed-By fields X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=950d3a6f5d3733d912a9e9b586d8de7d9405db7b;p=dak jennifer: re-enable ar check, cope with broken Changed-By fields --- diff --git a/ChangeLog b/ChangeLog index 87c10777..5dbb8929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-11-25 Anthony Towns + + * jennifer: If changed-by parsing fails, set variables to "" so REJECT + works + * jennifer: Re-enable .deb ar format checking + 2005-11-15 Anthony Towns * Merge of changes from spohr, by various people. diff --git a/jennifer b/jennifer index 92055bf2..c19e1ec5 100755 --- a/jennifer +++ b/jennifer @@ -2,7 +2,7 @@ # Checks Debian packages from Incoming # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 James Troup -# $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: