move show-deferred to dak

[dak.git] / dak / dak.py

diff --git a/dak/dak.py b/dak/dak.py
index 06e923d1d2e63ced1a4fbd4075e189bc42d50974..c987c1e708601db9442b8ac9d1ba240915bc9f05 100755 (executable)
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -28,8 +28,48 @@
 
 ################################################################################
 
-import sys
-import daklib.utils
+import sys, imp
+import daklib.utils, daklib.extensions
+
+################################################################################
+
+class UserExtension:
+    def __init__(self, user_extension = None):
+        if user_extension:
+            m = imp.load_source("dak_userext", user_extension)
+            d = m.__dict__
+        else:
+            m, d = None, {}
+        self.__dict__["_module"] = m
+        self.__dict__["_d"] = d
+
+    def __getattr__(self, a):
+        if a in self.__dict__: return self.__dict__[a]
+        if a[0] == "_": raise AttributeError, a
+        return self._d.get(a, None)
+
+    def __setattr__(self, a, v):
+        self._d[a] = v
+
+################################################################################
+
+class UserExtension:
+    def __init__(self, user_extension = None):
+        if user_extension:
+            m = imp.load_source("dak_userext", user_extension)
+            d = m.__dict__
+        else:
+            m, d = None, {}
+        self.__dict__["_module"] = m
+        self.__dict__["_d"] = d
+
+    def __getattr__(self, a):
+        if a in self.__dict__: return self.__dict__[a]
+        if a[0] == "_": raise AttributeError, a
+        return self._d.get(a, None)
+
+    def __setattr__(self, a, v):
+        self._d[a] = v
 
 ################################################################################
 
@@ -46,17 +86,21 @@ def init():
          "Archive sanity checks"),
         ("queue-report",
          "Produce a report on NEW and BYHAND packages"),
-        
+        ("show-new",
+         "Output html for packages in NEW"),
+        ("show-deferred",
+         "Output html and symlinks for packages in DEFERRED"),
+
         ("rm",
          "Remove packages from suites"),
-        
+
         ("process-new",
          "Process NEW and BYHAND packages"),
         ("process-unchecked",
          "Process packages in queue/unchecked"),
         ("process-accepted",
          "Install packages into the pool"),
-        
+
         ("make-suite-file-list",
          "Generate lists of packages per suite for apt-ftparchive"),
         ("generate-releases",
@@ -69,7 +113,9 @@ def init():
          "Clean cruft from incoming"),
         ("clean-proposed-updates",
          "Remove obsolete .changes from proposed-updates"),
-        
+
+        ("transitions",
+         "Manage the release transition file"),
         ("check-overrides",
          "Override cruft checks"),
         ("check-proposed-updates",
@@ -122,7 +168,7 @@ def init():
          "Generate compatability symlinks from dists/ into pool/"),
         ]
     return functionality
-    
+
 ################################################################################
 
 def usage(functionality, exit_code=0):
@@ -141,9 +187,16 @@ Availble commands:"""
 def main():
     """Launch dak functionality."""
 
+    Cnf = daklib.utils.get_conf()
+
+    if Cnf.has_key("Dinstall::UserExtensions"):
+        userext = UserExtension(Cnf["Dinstall::UserExtensions"])
+    else:
+        userext = UserExtension()
+
     functionality = init()
     modules = [ command for (command, _) in functionality ]
-    
+
     if len(sys.argv) == 0:
         daklib.utils.fubar("err, argc == 0? how is that possible?")
     elif (len(sys.argv) == 1
@@ -177,6 +230,13 @@ def main():
 
     # Invoke the module
     module = __import__(cmdname.replace("-","_"))
+
+    module.dak_userext = userext
+    userext.dak_module = module
+
+    daklib.extensions.init(cmdname, module, userext)
+    if userext.init is not None: userext.init(cmdname)
+
     module.main()
 
 ################################################################################