X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Ftransitions.py;h=acae2072a10e6078f520a43c886d8bb5e2ef7448;hb=c6e4df0a3357a7c08ff1cc0e94a7d978a0f1bdaf;hp=81737bcf396e76e03600f8504c0d7a530c26ad4f;hpb=198d9f2de25edf41dff3144c047039138b06af3b;p=dak.git

diff --git a/dak/transitions.py b/dak/transitions.py
index 81737bcf..acae2072 100755
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -406,16 +406,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
@@ -533,23 +533,23 @@ def transition_info(transitions):
         expected = t["new"]
 
         # Will be None if nothing is in testing.
-        source = get_source_in_suite(source, "testing", session)
+        sourceobj = get_source_in_suite(source, "testing", session)
 
         print get_info(trans, source, expected, t["rm"], t["reason"], t["packages"])
 
-        if source is None:
+        if sourceobj is None:
             # No package in testing
             print "Transition source %s not in testing, transition still ongoing." % (source)
         else:
-            compare = apt_pkg.VersionCompare(source.version, expected)
+            compare = apt_pkg.VersionCompare(sourceobj.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" % (source.version)
+                print "This transition is still ongoing, we currently have version %s" % (sourceobj.version)
             else:
                 print "This transition is over, the target package reached testing, should be removed"
-                print "%s wanted version: %s, has %s" % (source, expected, source.version)
+                print "%s wanted version: %s, has %s" % (source, expected, sourceobj.version)
         print "-------------------------------------------------------------------------"
 
 ################################################################################