Merge commit 'ftpmaster/master'

[dak.git] / dak / transitions.py

diff --git a/dak/transitions.py b/dak/transitions.py
index a208a4022a3910f2bf4e3b1004206d770291940f..4c4ac78ee8a0ed5cb4ad44d9deaf3894a66a87fb 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -34,7 +34,6 @@ import time
 import errno
 import fcntl
 import tempfile
-import pwd
 import apt_pkg
 
 from daklib.dbconn import *
@@ -406,16 +405,16 @@ def check_transitions(transitions):
         expected = t["new"]
 
         # Will be an empty list if nothing is in testing.
-        sources = get_source_in_suite(source, "testing", session)
+        sourceobj = get_source_in_suite(source, "testing", session)
 
         info[trans] = get_info(trans, source, expected, t["rm"], t["reason"], t["packages"])
         print info[trans]
 
-        if len(sources) < 1:
+        if sourceobj is None:
             # No package in testing
             print "Transition source %s not in testing, transition still ongoing." % (source)
         else:
-            current = sources[0].version
+            current = sourceobj.version
             compare = apt_pkg.VersionCompare(current, expected)
             if compare < 0:
                 # This is still valid, the current version in database is older than