cmd -> command

[dak.git] / daklib / queue.py

diff --git a/daklib/queue.py b/daklib/queue.py
index 4e5368770d52ff3565c34e7fe37469458155c7a0..41c573356088afa295d217759d8bb95fce9d6d58 100755 (executable)
--- 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,7 +1237,7 @@ 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):
@@ -1279,7 +1279,7 @@ class Upload(object):
                 self.rejects.append("%s: Found lintian output: '%s %s', automatically rejected package." % (epackage, etag, etext))
                 # Now tell if they *might* override it.
                 if etag in lintiantags['warning']:
-                    self.rejects.append("%s: If you have a good reason, you may override this lintian tag. Laziness to fix your crap is NOT A GOOD REASON, sod off" % (epackage))
+                    self.rejects.append("%s: If you have a good reason, you may override this lintian tag." % (epackage))
 
     ###########################################################################
     def check_urgency(self):
@@ -1734,7 +1734,7 @@ distribution."""
         # <Ganneff> yes
 
         # This routine returns None on success or an error on failure
-        res = get_queue('accepted').autobuild_upload(self.pkg, cnf["Dir::Queue::Accepted"])
+        res = get_or_set_queue('accepted').autobuild_upload(self.pkg, cnf["Dir::Queue::Accepted"])
         if res:
             utils.fubar(res)