X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=cbdf57a3429a65cbf8d1dede7371e88ea37eb758;hb=b63fcd0267b0effdb445f3da7cea35830e85eed4;hp=d217d7e4c39a836f7a0530eb402653e4a1e0b2e6;hpb=4c2ec0229b86a4ddb196bb567cf90ea2f94ae84f;p=dak.git diff --git a/daklib/queue.py b/daklib/queue.py index d217d7e4..cbdf57a3 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -26,7 +26,6 @@ Queue utility functions for dak ############################################################################### -import cPickle import errno import os import pg @@ -1000,11 +999,6 @@ class Upload(object): for field_name in [ "build-depends", "build-depends-indep" ]: field = self.pkg.dsc.get(field_name) if field: - # Check for broken dpkg-dev lossage... - if field.startswith("ARRAY"): - self.rejects.append("%s: invalid %s field produced by a broken version of dpkg-dev (1.10.11)" % \ - (dsc_filename, field_name.title())) - # Have apt try to parse them... try: apt_pkg.ParseSrcDepends(field) @@ -1075,7 +1069,7 @@ class Upload(object): (result, output) = commands.getstatusoutput(cmd) if (result != 0): self.rejects.append("'dpkg-source -x' failed for %s [return code: %s]." % (dsc_filename, result)) - self.rejects.append(utils.prefix_multi_line_string(output, " [dpkg-source output:] "), "") + self.rejects.append(utils.prefix_multi_line_string(output, " [dpkg-source output:] ")) return if not cnf.Find("Dir::Queue::BTSVersionTrack"): @@ -1248,7 +1242,7 @@ class Upload(object): os.unlink(temp_filename) if (result != 0): self.rejects.append("lintian failed for %s [return code: %s]." % (self.pkg.changes_file, result)) - self.rejects.append(utils.prefix_multi_line_string(output, " [possible output:] "), "") + self.rejects.append(utils.prefix_multi_line_string(output, " [possible output:] ")) return if len(output) == 0: