X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdak.py;h=5a986d55ef39cb11b20bef0246c97a36d9d43967;hb=d9822f04453a1b62ca0aa66e2efeea35f654778f;hp=0eeb9d7b80255ef47281933719f5c5919de9456f;hpb=1e8dd7a1e4aa362cb5275a4db27251a77e5a9c34;p=dak.git

diff --git a/dak/dak.py b/dak/dak.py
old mode 100755
new mode 100644
index 0eeb9d7b..5a986d55
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -36,12 +36,12 @@ 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__
+            m = imp.load_source("dak_userext", user_extension)
+            d = m.__dict__
         else:
             m, d = None, {}
-	self.__dict__["_module"] = m
-	self.__dict__["_d"] = d
+        self.__dict__["_module"] = m
+        self.__dict__["_d"] = d
 
     def __getattr__(self, a):
         if a in self.__dict__: return self.__dict__[a]
@@ -49,7 +49,27 @@ class UserExtension:
         return self._d.get(a, None)
 
     def __setattr__(self, a, v):
-	self._d[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
 
 ################################################################################
 
@@ -68,17 +88,17 @@ def init():
          "Produce a report on NEW and BYHAND packages"),
         ("show-new",
          "Output html for packages in NEW"),
-        
+
         ("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",
@@ -146,7 +166,7 @@ def init():
          "Generate compatability symlinks from dists/ into pool/"),
         ]
     return functionality
-    
+
 ################################################################################
 
 def usage(functionality, exit_code=0):
@@ -174,7 +194,7 @@ def main():
 
     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