X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jennifer;h=0e8f0393a650a890797e0c10d6a26221c750af8d;hb=a29673e49824a6c0838df50ab64ac08cf32852d8;hp=d40d77c8698a7a9c3a658d136ff542b677c06828;hpb=a319a419ba2ea0e99b5aa6fe3342cf15148f6b2a;p=dak.git

diff --git a/jennifer b/jennifer
index d40d77c8..0e8f0393 100755
--- 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.32 2003-02-11 18:10:37 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.32 $";
+jennifer_version = "$Revision: 1.37 $";
 
 Cnf = None;
 Options = None;
@@ -241,7 +241,7 @@ def check_changes():
     base_filename = os.path.basename(filename);
     for dir in [ "Accepted", "Byhand", "Done", "New" ]:
         if os.path.exists(Cnf["Dir::Queue::%s" % (dir) ]+'/'+base_filename):
-            reject("a changes file with the same name already exists in the %s directory." % (dir));
+            reject("%s: a file with this name already exists in the %s directory." % (base_filename, dir));
 
     return 1;
 
@@ -432,7 +432,7 @@ def check_files():
                     reject("source version (%s) for %s doesn't match changes version %s." % (source_version, file, changes["version"]));
             else:
                 # Check in the SQL database
-                if not Katie.source_exists(source_package, source_version):
+                if not Katie.source_exists(source_package, source_version, changes["distribution"].keys()):
                     # Check in one of the other directories
                     source_epochless_version = utils.re_no_epoch.sub('', source_version);
                     dsc_filename = "%s_%s.dsc" % (source_package, source_epochless_version);
@@ -596,13 +596,15 @@ def check_dsc ():
             if dsc.has_key("version") and not re_valid_version.match(dsc["version"]):
                 reject("%s: invalid version number '%s'." % (file, dsc["version"]));
 
-            # The dpkg maintainer from hell strikes again! Bumping the
-            # version number of the .dsc breaks extraction by stable's
-            # dpkg-source.
+            # Bumping the version number of the .dsc breaks extraction by stable's
+            # dpkg-source.  So let's not do that...
             if dsc["format"] != "1.0":
-                reject("""[dpkg-sucks] source package was produced by a broken version
-          of dpkg-dev 1.9.1{3,4}; please rebuild with >= 1.9.15 version
-          installed.""");
+                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 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"));
@@ -642,19 +644,16 @@ def check_dsc ():
 
 ################################################################################
 
-# Some cunning stunt broke dpkg-source in dpkg 1.8{,.1}; detect the
+# dpkg-source broke .diff.gz generation in dpkg 1.8.x; detect the
 # resulting bad source packages and reject them.
 
-# Even more amusingly the fix in 1.8.1.1 didn't actually fix the
-# problem just changed the symptoms.
-
 def check_diff ():
     for filename in files.keys():
         if files[filename]["type"] == "diff.gz":
             file = gzip.GzipFile(filename, 'r');
             for line in file.readlines():
                 if re_bad_diff.search(line):
-                    reject("[dpkg-sucks] source package was produced by a broken version of dpkg-dev 1.8.x; please rebuild with >= 1.8.3 version installed.");
+                    reject("%s: invalid .diff.gz produced by a broken version of dpkg-dev 1.8.x." % (filename));
                     break;
 
 ################################################################################
@@ -762,7 +761,7 @@ def check_timestamps():
                            % (filename, num_ancient_files, ancient_file,
                               time.ctime(ancient_date)));
             except:
-                reject("%s: timestamp check failed; caught %s" % (filename, sys.exc_type));
+                reject("%s: deb contents timestamp check failed [%s: %s]" % (filename, sys.exc_type, sys.exc_value));
 
 ################################################################################
 ################################################################################
@@ -912,7 +911,7 @@ def acknowledge_new (summary):
         print "Sending new ack.";
         Subst["__SUMMARY__"] = summary;
         new_ack_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/jennifer.new");
-        utils.send_mail(new_ack_message,"");
+        utils.send_mail(new_ack_message);
 
     # Finally remove the originals.
     os.chdir (pkg.directory);