X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fqueue.py;h=c30aeb0566853c6de967416fe8049a1d9bd71936;hb=b7d36f712210b0efac983da88ae91cdd3fd7f469;hp=b2ee5e3fe3fcbc950da01563b1724ed6feeab1d0;hpb=a5d7d22121e018672da9dd74c89c046fb4dba1f9;p=dak.git diff --git a/daklib/queue.py b/daklib/queue.py index b2ee5e3f..c30aeb05 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -1208,7 +1208,7 @@ class Upload(object): return cnf = Config() - tagfile = cnf("Dinstall::LintianTags") + tagfile = cnf["Dinstall::LintianTags"] # Parse the yaml file sourcefile = file(tagfile, 'r') sourcecontent = sourcefile.read() @@ -1237,13 +1237,12 @@ class Upload(object): # So now we should look at running lintian at the .changes file, capturing output # to then parse it. command = "lintian --show-overrides --tags-from-file %s %s" % (temp_filename, self.pkg.changes_file) - (result, output) = commands.getstatusoutput(cmd) + (result, output) = commands.getstatusoutput(command) # We are done with lintian, remove our tempfile 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:] ")) - return + if (result == 2): + utils.warn("lintian failed for %s [return code: %s]." % (self.pkg.changes_file, result)) + utils.warn(utils.prefix_multi_line_string(output, " [possible output:] ")) if len(output) == 0: return