From: Joerg Jaspert Date: Sun, 2 Mar 2008 15:12:20 +0000 (+0100) Subject: * daklib/queue.py (check_transition): Added in here X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b21637628cd8a4b4ac060efc6396ff966ddfe8a8;p=dak.git * daklib/queue.py (check_transition): Added in here Modified so it only cleans up when called with cleanup parameter. Which will be called from a seperate script for the release managers. * dak/process_unchecked.py (check_transition): Warn on broken transitions file and return, not doing anything. (check_transition): Moved out of here, into daklib/queue (process_it): Call it in daklib.queue, but only if changes[architecture] has source included. --- diff --git a/ChangeLog b/ChangeLog index 71933374..8a01bedc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,19 @@ 2008-03-02 Joerg Jaspert + * daklib/queue.py (check_transition): Added in here + Modified so it only cleans up when called with cleanup + parameter. Which will be called from a seperate script for the + release managers. + * dak/process_unchecked.py (check_transition): Added. Checks if a release team member defined a transition, and rejects based on that data. (process_it): Use it. + (check_transition): Warn on broken transitions file and return, + not doing anything. + (check_transition): Moved out of here, into daklib/queue + (process_it): Call it in daklib.queue, but only if + changes[architecture] has source included. 2008-02-06 Joerg Jaspert diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index 20a896b4..c3b5d201 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -1141,74 +1141,6 @@ def upload_too_new(): os.chdir(cwd) return too_new -################################################################################ -################################################################################ - -# We reject packages if the release team defined a transition for them -def check_transition(): - to_dump = 0 - - # Only check if there is a file defined (and existant) with checks. It's a little bit - # specific to Debian, not much use for others, so return early there. - if not Cnf.has_key("Dinstall::Reject::ReleaseTransitions") and - not os.path.exists("%s" % (Cnf["Dinstall::Reject::ReleaseTransitions"])): - return - - # No need to do anything if this upload has no source included - if not changes["architecture"].has_key("source"): - return - - # Parse the yaml file - sourcefile = file(Cnf["Dinstall::Reject::ReleaseTransitions"], 'r') - transitions = load(sourcefile) - - # Now look through all defined transitions - for trans in transition: - t = transition[trans] - # We check if the transition is still valid - # If not we remove the whole setting from the dictionary and later dump it, - # so we don't process it again. - source = t["source"] - new_vers = t["new"] - q = Upload.projectB.query(""" - SELECT s.version FROM source s, suite su, src_associations sa - WHERE sa.source=s.id - AND sa.suite=su.id - AND su.suite_name='testing' - AND s.source='%s'""" - % (source)) - ql = q.getresult() - if ql and apt_pkg.VersionCompare(new_vers, ql[0][0]) == 1: - # This is still valid, the current version in database is older than - # the new version we wait for - - # Check if the source we look at is affected by this. - if changes["source"] in t['packages']: - # The source is affected, lets reject it. - reject("""%s: part of the %s transition. - - Your package is part of a testing transition to get %s migrated. - - Transition description: %s - - This transition will finish when %s, version %s, reaches testing. - This transition is managed by the Release Team and %s - is the Release-Team member responsible for it. - Please contact them or debian-release@lists.debian.org if you - need further assistance. - """ - % (changes["source"], trans, source, t["reason"], source, new_vers, t["rm"])) - return 0 - else: - # We either have the wanted or a newer version in testing, or the package got - # removed completly. In that case we don't need to keep the transition blocker - del transition[trans] - to_dump = 1 - - if to_dump: - destfile = file(Cnf["Dinstall::Reject::ReleaseTransitions"], 'w') - dump(transition, destfile) - ################################################################################ def action (): @@ -1592,7 +1524,8 @@ def process_it (changes_file): check_urgency() check_timestamps() check_signed_by_key() - check_transition() + if changes["architecture"].has_key("source"): + daklib.queue.check_transition(changes["source"]) Upload.update_subst(reject_message) action() except SystemExit: diff --git a/daklib/queue.py b/daklib/queue.py index 05cd0be0..3169e7a2 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -134,6 +134,72 @@ def check_valid(new): (priority != "source" and type == "dsc"): new[pkg]["priority id"] = -1 +################################################################################ + +# We reject packages if the release team defined a transition for them +def check_transition(sourcepkg, cleanup=0): + to_dump = 0 + + # Only check if there is a file defined (and existant) with checks. It's a little bit + # specific to Debian, not much use for others, so return early there. + if not Cnf.has_key("Dinstall::Reject::ReleaseTransitions") and + not os.path.exists("%s" % (Cnf["Dinstall::Reject::ReleaseTransitions"])): + return + + # Parse the yaml file + sourcefile = file(Cnf["Dinstall::Reject::ReleaseTransitions"], 'r') + try: + transitions = load(sourcefile) + except error, msg: + utils.warn("Not checking transitions, the transitions file is broken: %s." % (msg)) + return + + # Now look through all defined transitions + for trans in transition: + t = transition[trans] + # We check if the transition is still valid + # If not we remove the whole setting from the dictionary and later dump it, + # so we don't process it again. + source = t["source"] + new_vers = t["new"] + q = Upload.projectB.query(""" + SELECT s.version FROM source s, suite su, src_associations sa + WHERE sa.source=s.id + AND sa.suite=su.id + AND su.suite_name='testing' + AND s.source='%s'""" + % (source)) + ql = q.getresult() + if ql and apt_pkg.VersionCompare(new_vers, ql[0][0]) == 1: + # This is still valid, the current version in database is older than + # the new version we wait for + + # Check if the source we look at is affected by this. + if sourcepkg in t['packages']: + # The source is affected, lets reject it. + reject("""%s: part of the %s transition. + + Your package is part of a testing transition to get %s migrated. + + Transition description: %s + + This transition will finish when %s, version %s, reaches testing. + This transition is managed by the Release Team and %s + is the Release-Team member responsible for it. + Please contact them or debian-release@lists.debian.org if you + need further assistance. + """ + % (sourcepkg, trans, source, t["reason"], source, new_vers, t["rm"])) + return 0 + else: + # We either have the wanted or a newer version in testing, or the package got + # removed completly. In that case we don't need to keep the transition blocker + del transition[trans] + to_dump = 1 + + if cleanup and to_dump: + destfile = file(Cnf["Dinstall::Reject::ReleaseTransitions"], 'w') + dump(transition, destfile) ###############################################################################