Merge commit 'mhy/master' into merge

[dak.git] / dak / transitions.py

diff --git a/dak/transitions.py b/dak/transitions.py
index 808831b1cd49f66dbc67de49babc5532400256bf..d9da5c420b5906062d5853bf28b27245667c69ba 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -511,7 +511,7 @@ New Version: %s
 Responsible: %s
 Description: %s
 Blocked Packages (total: %d): %s
-""" % (trans, source, expected, rm, reason, len(packages), ", ".join(packages))
+""" % (trans, source.source, expected, rm, reason, len(packages), ", ".join(packages))
 
 ################################################################################
 
@@ -532,25 +532,24 @@ def transition_info(transitions):
         source = t["source"]
         expected = t["new"]
 
-        # Will be empty list if nothing is in testing.
-        sources = get_source_in_suite(source, "testing", session)
+        # Will be None if nothing is in testing.
+        source = get_source_in_suite(source, "testing", session)
 
         print get_info(trans, source, expected, t["rm"], t["reason"], t["packages"])
 
-        if len(sources) < 1:
+        if source is None:
             # No package in testing
             print "Transition source %s not in testing, transition still ongoing." % (source)
         else:
-            current = sources[0].version
-            compare = apt_pkg.VersionCompare(current, expected)
+            compare = apt_pkg.VersionCompare(source.version, expected)
             print "Apt compare says: %s" % (compare)
             if compare < 0:
                 # This is still valid, the current version in database is older than
                 # the new version we wait for
-                print "This transition is still ongoing, we currently have version %s" % (current)
+                print "This transition is still ongoing, we currently have version %s" % (source.version)
             else:
                 print "This transition is over, the target package reached testing, should be removed"
-                print "%s wanted version: %s, has %s" % (source, expected, current)
+                print "%s wanted version: %s, has %s" % (source, expected, source.version)
         print "-------------------------------------------------------------------------"
 
 ################################################################################