X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Ftransitions.py;h=4c4ac78ee8a0ed5cb4ad44d9deaf3894a66a87fb;hb=6021a91078574c97968d076c0320182a20c33649;hp=d9da5c420b5906062d5853bf28b27245667c69ba;hpb=ac862714876c84c71c909341354ea1ac9b36e6d8;p=dak.git

diff --git a/dak/transitions.py b/dak/transitions.py
index d9da5c42..4c4ac78e 100755
--- 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
@@ -511,7 +510,7 @@ New Version: %s
 Responsible: %s
 Description: %s
 Blocked Packages (total: %d): %s
-""" % (trans, source.source, expected, rm, reason, len(packages), ", ".join(packages))
+""" % (trans, source, expected, rm, reason, len(packages), ", ".join(packages))
 
 ################################################################################
 
@@ -533,23 +532,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 "-------------------------------------------------------------------------"
 
 ################################################################################