X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=4a4cfd6b341d35f1f4e07e4425d2d30349eb9aeb;hb=ae6668e84b33470fd2d80f4cb177e3df2df7c23c;hp=0f462b56ee622425d768e6b0ac4602e6a5fbeb84;hpb=5b871d1cb7437b1aafaca9cc7346f374393c3fc3;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 0f462b56..4a4cfd6b 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -36,8 +36,6 @@ import daklib.queue
 import daklib.utils
 
 from types import *
-from syck import *
-
 
 ################################################################################
 
@@ -1000,62 +998,6 @@ def check_timestamps():
             except:
                 reject("%s: deb contents timestamp check failed [%s: %s]" % (filename, sys.exc_type, sys.exc_value))
 
-################################################################################
-################################################################################
-
-# We reject packages if the release team defined a transition for them
-def check_transition(sourcepkg):
-
-    # 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") or not os.path.exists("%s" % (Cnf["Dinstall::Reject::ReleaseTransitions"])):
-        return
-    
-    # Parse the yaml file
-    sourcefile = file(Cnf["Dinstall::Reject::ReleaseTransitions"], 'r')
-    sourcecontent = sourcefile.read()
-    try:
-        transitions = load(sourcecontent)
-    except error, msg:
-        # This shouldn't happen, the release team has a wrapper to check the file, but better
-        # safe then sorry
-        daklib.utils.warn("Not checking transitions, the transitions file is broken: %s." % (msg))
-        return
-
-    # Now look through all defined transitions
-    for trans in transitions:
-        t = transitions[trans]
-        source = t["source"]
-        new_vers = t["new"]
-
-        # Will be None if nothing is in testing.
-        curvers = daklib.database.get_testing_version(source)
-        if not curvers == None:
-            compare = apt_pkg.VersionCompare(curvers, new_vers)
-
-        if curvers == None or compare < 0:
-            # This is still valid, the current version in testing is older than
-            # the new version we wait for, or there is none in testing yet
-
-            # 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 (it currently
-has version %s).
-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, curvers, t["rm"]))
-                return 0
-
 ################################################################################
 
 def lookup_uid_from_fingerprint(fpr):
@@ -1580,8 +1522,6 @@ def process_it (changes_file):
                 check_urgency()
                 check_timestamps()
                 check_signed_by_key()
-                if changes["architecture"].has_key("source"):
-                    check_transition(changes["source"])
         Upload.update_subst(reject_message)
         action()
     except SystemExit: