X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdak.py;h=c987c1e708601db9442b8ac9d1ba240915bc9f05;hb=f8996e240d9d0278bce098e23be63db0bcc6fbee;hp=0eeb9d7b80255ef47281933719f5c5919de9456f;hpb=b584dbd5e518d5cc7ddd45649edf2bacb319131c;p=dak.git diff --git a/dak/dak.py b/dak/dak.py index 0eeb9d7b..c987c1e7 100755 --- 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,19 @@ def init(): "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", @@ -146,7 +168,7 @@ def init(): "Generate compatability symlinks from dists/ into pool/"), ] return functionality - + ################################################################################ def usage(functionality, exit_code=0): @@ -174,7 +196,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