daklib/extensions.py, dak/dak.py, config/debian/extensions.py: move

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

diff --git a/config/debian/extensions.py b/config/debian/extensions.py
index 7e418db3231fcf0d64f7eebf1dc23c01205209f1..9d6bef1c4c98674bda6b5fb9f865979465f91381 100644 (file)
--- a/config/debian/extensions.py
+++ b/config/debian/extensions.py
@@ -1,16 +1,10 @@
 import sys, os
 
-# 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
 
 @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
 
@@ -21,20 +15,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()
 
-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