X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fextensions.py;h=9823b29c5fd1f563adffb89f4207194429f9d4fe;hb=da0da02412e7b6a51a88a7ffcbe50893c28a81b9;hp=acc1947bfa69f510fb7380aee6ba2b49208d4b14;hpb=a6324611e898de79f2bb7947775984e28f4b2ede;p=dak.git

diff --git a/config/debian/extensions.py b/config/debian/extensions.py
index acc1947b..9823b29c 100644
--- a/config/debian/extensions.py
+++ b/config/debian/extensions.py
@@ -4,22 +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):
-        def myfunc(*a,**kw):
-	    global replaced_funcs
-            f(replaced_funcs[name], *a, **kw)
-	myfunc.__name__ = f.__name__
-	myfunc.__doc__ = f.__doc__
-	myfunc.__dict__.update(f.__dict__)
-
-        replace_funcs["%s:%s" % (module,name)] = myfunc
-	return f
-    return x
+import daklib.extensions
+from daklib.extensions import replace_dak_function
 
 def check_transition():
     changes = dak_module.changes
@@ -71,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"])))
@@ -109,15 +94,3 @@ def check_signed_by_key(oldfn):
     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
-