X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fchecks.py;h=ccf7feb4e9e61b4510a32d0d8c17b07f487dc251;hb=376ba0329ab1423904bde2a22fbe7dd2080d3e2b;hp=d148d15bdd9f7d0959cae33e7163ac620e84e6ec;hpb=a30decdb682d9446e0141b231fd03cf365d74d52;p=dak.git diff --git a/daklib/checks.py b/daklib/checks.py index d148d15b..ccf7feb4 100644 --- a/daklib/checks.py +++ b/daklib/checks.py @@ -39,6 +39,7 @@ from apt_pkg import version_compare import errno import os import subprocess +import textwrap import time import yaml @@ -551,16 +552,18 @@ class TransitionCheck(Check): if transitions is None: return True + session = upload.session + control = upload.changes.changes source = re_field_source.match(control['Source']).group('package') for trans in transitions: t = transitions[trans] - source = t["source"] + transition_source = t["source"] expected = t["new"] # Will be None if nothing is in testing. - current = get_source_in_suite(source, "testing", session) + current = get_source_in_suite(transition_source, "testing", session) if current is not None: compare = apt_pkg.version_compare(current.version, expected) @@ -587,7 +590,7 @@ currently {1}, we need version {2}). This transition is managed by the Release Team, and {3} is the Release-Team member responsible for it. Please mail debian-release@lists.debian.org or contact {3} directly if you need further assistance. You might want to upload to experimental until this -transition is done.""".format(source, currentlymsg, expected,t["rm"]))) +transition is done.""".format(transition_source, currentlymsg, expected,t["rm"]))) raise Reject(rejectmsg)