X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Ftransitions.py;h=a208a4022a3910f2bf4e3b1004206d770291940f;hb=f41a5c6d7f9942de65c9644abb5517034f55d425;hp=808831b1cd49f66dbc67de49babc5532400256bf;hpb=782339bc8e1a2e17b9e6b3009b22b5efa74218f7;p=dak.git diff --git a/dak/transitions.py b/dak/transitions.py index 808831b1..a208a402 100755 --- a/dak/transitions.py +++ b/dak/transitions.py @@ -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. + sourceobj = get_source_in_suite(source, "testing", session) print get_info(trans, source, expected, t["rm"], t["reason"], t["packages"]) - 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 - compare = apt_pkg.VersionCompare(current, 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" % (current) + 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, current) + print "%s wanted version: %s, has %s" % (source, expected, sourceobj.version) print "-------------------------------------------------------------------------" ################################################################################