From 88e38dcc11c4a5c1f69fbb55241e00f83c617a38 Mon Sep 17 00:00:00 2001 From: James Troup Date: Tue, 16 Sep 2003 20:41:21 +0000 Subject: [PATCH] Normalize reject messages and tone down dpkg-sucks ones. Add new check for Build-Depends: ARRAY breakage. --- TODO | 26 +++++++++++++++++++++++++- jennifer | 26 ++++++++++++-------------- katie.py | 4 ++-- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/TODO b/TODO index 5d7dbb8c..f104b821 100644 --- a/TODO +++ b/TODO @@ -373,7 +373,7 @@ Possible Quotes: | SirDibos: that sentence sounds like it wants to be a bug report when it grows up -------- +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | From: Andrew Morton | Subject: Re: Linux 2.6.0-test1 Ext3 Ooops. Reboot needed. @@ -392,8 +392,32 @@ Possible Quotes: | I was attacked by dselect as a small child and have since avoided debian. | Is there a tarball anywhere? +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + | From: Bob Hilliard | | In my experience, James has been very responsive, albeit not | verbose, to reasonable questions/requests that don't start out saying | "James is a bum - throw him out". + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +| Kamion: are you too busy to look at my generic +| include/exclude stuff for the bts yet? +| eigood: expect me to be busy for about the next week at this +| rate +| my %field_match = ( +| 'subject' => \&contains_field_match, +| 'severity' => \&exact_field_match, +| that's how it works, basically +| I'm a big fan of callbacks +| [...] +| Kamion: how do you feel about having +| per-bug/per-package/per-source notes support in the bts? +| eigood: as I said five minutes ago, I really don't have time +| to think about it right now, sorry +| here, maybe it would be clearer if I /part +| <-- Kamion (~cjwatson@host81-129-36-235.in-addr.btopenworld.com) has left #debian-devel (too busy. no, really.) +| no need to be hostile +| eigood: he told you he's too busy and you kept bugging him. take +| a hint :) diff --git a/jennifer b/jennifer index a769b63b..0e3f8dd7 100755 --- a/jennifer +++ b/jennifer @@ -2,7 +2,7 @@ # Checks Debian packages from Incoming # Copyright (C) 2000, 2001, 2002, 2003 James Troup -# $Id: jennifer,v 1.35 2003-07-29 14:00:39 ajt Exp $ +# $Id: jennifer,v 1.36 2003-09-16 20:41:21 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.35 $"; +jennifer_version = "$Revision: 1.36 $"; 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; @@ -596,13 +596,14 @@ 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() 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)); # 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 +643,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; ################################################################################ diff --git a/katie.py b/katie.py index 8f76c7d5..3de932a1 100644 --- a/katie.py +++ b/katie.py @@ -2,7 +2,7 @@ # Utility functions for katie # Copyright (C) 2001, 2002, 2003 James Troup -# $Id: katie.py,v 1.38 2003-08-18 15:04:17 ajt Exp $ +# $Id: katie.py,v 1.39 2003-09-16 20:41:21 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 @@ -764,7 +764,7 @@ SELECT b.id FROM binaries b, architecture a files[file]["version"], files[file]["architecture"])) if q.getresult(): - self.reject("can not overwrite existing copy of '%s' already in the archive." % (file)); + self.reject("%s: can not overwrite existing copy already in the archive." % (file)); return self.reject_message; -- 2.39.5