Initial pass at dak web server

[dak.git] / daklib / checks.py

diff --git a/daklib/checks.py b/daklib/checks.py
index abc2dcc1cb958d0ea94e12dfd7c6f9db2a28910c..ccf7feb4e9e61b4510a32d0d8c17b07f487dc251 100644 (file)
--- a/daklib/checks.py
+++ b/daklib/checks.py
@@ -39,6 +39,7 @@ from apt_pkg import version_compare
 import errno
 import os
 import subprocess
+import textwrap
 import time
 import yaml
 
@@ -551,16 +552,18 @@ class TransitionCheck(Check):
         if transitions is None:
             return True
 
+        session = upload.session
+
         control = upload.changes.changes
         source = re_field_source.match(control['Source']).group('package')
 
         for trans in transitions:
             t = transitions[trans]
-            source = t["source"]
+            transition_source = t["source"]
             expected = t["new"]
 
             # Will be None if nothing is in testing.
-            current = get_source_in_suite(source, "testing", session)
+            current = get_source_in_suite(transition_source, "testing", session)
             if current is not None:
                 compare = apt_pkg.version_compare(current.version, expected)
 
@@ -587,7 +590,7 @@ currently {1}, we need version {2}).  This transition is managed by the
 Release Team, and {3} is the Release-Team member responsible for it.
 Please mail debian-release@lists.debian.org or contact {3} directly if you
 need further assistance.  You might want to upload to experimental until this
-transition is done.""".format(source, currentlymsg, expected,t["rm"])))
+transition is done.""".format(transition_source, currentlymsg, expected,t["rm"])))
 
                     raise Reject(rejectmsg)
 
@@ -662,7 +665,7 @@ class LintianCheck(Check):
             if user is not None:
                 cmd.extend(['sudo', '-H', '-u', user])
 
-            cmd.extend(['LINTIAN_COLL_UNPACKED_SKIP_SIG=1', '/usr/bin/lintian', '--show-overrides', '--tags-from-file', temp_filename, changespath])
+            cmd.extend(['/usr/bin/lintian', '--show-overrides', '--tags-from-file', temp_filename, changespath])
             output = daklib.daksubprocess.check_output(cmd, stderr=subprocess.STDOUT)
         except subprocess.CalledProcessError as e:
             result = e.returncode