extensions.py: minor tidyup

[dak.git] / config / debian / extensions.py

diff --git a/config/debian/extensions.py b/config/debian/extensions.py
index 851360ff553f5f54c1a9a32de9c532423165a614..9823b29c5fd1f563adffb89f4207194429f9d4fe 100644 (file)
--- a/config/debian/extensions.py
+++ b/config/debian/extensions.py
@@ -4,14 +4,8 @@ import apt_pkg
 import daklib.utils, daklib.database
 import syck
 
-# This function and its data should move into daklib/extensions.py
-# or something.
-replaced_funcs = {}
-replace_funcs = {}
-def replace_dak_function(module,name):
-    def x(f):
-        replace_funcs["%s:%s" % (module,name)] = f
-    return x
+import daklib.extensions
+from daklib.extensions import replace_dak_function
 
 def check_transition():
     changes = dak_module.changes
@@ -63,18 +57,17 @@ def check_transition():
 
                rejectmsg = "%s: part of the %s transition.\n\n" % (
                        sourcepkg, trans)
+               rejectmsg += "Transition description: %s\n\n" % (t["reason"])
 
                if current is not None:
                    currentlymsg = "at version %s" % (current)
                else:
                    currentlymsg = "not present in testing"
 
-               rejectmsg += "Transition description: %s\n\n" % (t["reason"])
-
                rejectmsg += "\n".join(textwrap.wrap("""Your package
 is part of a testing transition designed to get %s migrated (it is
 currently %s, we need version %s).  This transition is managed by the
-Release Team, and %s is the Release-Team member responsible for it.
+release team, and %s is the release team member responsible for it.
 Please mail debian-release@lists.debian.org or contact %s directly if you
 need further assistance."""
                        % (source, currentlymsg, expected,t["rm"], t["rm"])))
@@ -83,7 +76,7 @@ need further assistance."""
                 return
 
 @replace_dak_function("process-unchecked", "check_signed_by_key")
-def check_signed_by_key():
+def check_signed_by_key(oldfn):
     changes = dak_module.changes
     reject = dak_module.reject
 
@@ -94,22 +87,10 @@ def check_signed_by_key():
             reject("Upload blocked due to hijack attempt 2008/03/19")
 
            # NB: 1.15.0, 1.15.2 signed by this key targetted at unstable
-           #     have been made available in the wild, and should not be
+           #     have been made available in the wild, and should remain
            #     blocked until Debian's dpkg has revved past those version
            #     numbers
 
-    replaced_funcs["check_signed_by_key"]()
+    oldfn()
 
     check_transition()
-
-def init(name):
-    global replaced_funcs
-
-    # This bit should be done automatically too
-    replaced_funcs = {}
-    for f,newfunc in replace_funcs.iteritems():
-        m,f = f.split(":",1)
-        if len(f) > 0 and m == name:
-           replaced_funcs[f] = dak_module.__dict__[f]
-           dak_module.__dict__[f] = newfunc
-