Also check build-depends-indep for array lossage (mdz@).

diff --git a/TODO b/TODO
index f104b821001bd63ada3fed46331a8e20defd96d7..0bed3d337a31f4de49506627f0327b9d7296d49c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -27,6 +27,9 @@ queue/approved
 Others
 ------
 
+<elmo_home> [<random>maybe I should reject debian packages with a non-Debian origin or bugs field</>]
+<Kamion> [<random>agreed; dunno what origin does but non-Debian bugs fields would be bad]
+
   o rhona should make use of select..except select, temporary tables
   etc. rather than looping and calling SQL every time so we can do
   suite removal sanely (see potato-removal document)

diff --git a/jennifer b/jennifer
index 0e3f8dd7c2f7b0b521771295185d527901833711..0e8f0393a650a890797e0c10d6a26221c750af8d 100755 (executable)
--- a/jennifer
+++ b/jennifer
@@ -2,7 +2,7 @@
 
 # Checks Debian packages from Incoming
 # Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: jennifer,v 1.36 2003-09-16 20:41:21 troup Exp $
+# $Id: jennifer,v 1.37 2003-09-22 01:28:08 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
@@ -45,7 +45,7 @@ re_valid_pkg_name = re.compile(r"^[\dA-Za-z][\dA-Za-z\+\-\.]+$");
 ################################################################################
 
 # Globals
-jennifer_version = "$Revision: 1.36 $";
+jennifer_version = "$Revision: 1.37 $";
 
 Cnf = None;
 Options = None;
@@ -602,8 +602,9 @@ def check_dsc ():
                 reject("%s: incompatible 'Format' version produced by a broken version of dpkg-dev 1.9.1{3,4}." % (file));
 
             # Build-Depends: ARRAY(<hex>) is not good ...
-            if dsc.get("build-depends","").find("ARRAY") == 0:
-                reject("%s: invalid 'Build-Depends' field produced by a broken version of dpkg-dev (1.10.11)" % (file));
+            if (dsc.get("build-depends","").find("ARRAY") == 0 or
+                dsc.get("build-depends-indep","").find("ARRAY") == 0):
+                reject("%s: invalid Build-Depends field produced by a broken version of dpkg-dev (1.10.11)" % (file));
 
             # Ensure the version number in the .dsc matches the version number in the .changes
             epochless_dsc_version = utils.re_no_epoch.sub('', dsc.get("version"));