X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fdak.py;h=5a986d55ef39cb11b20bef0246c97a36d9d43967;hb=06b17e68fd4a76e7a12f741f26654e55bff05c79;hp=0f2280101858fd672b9c6649952a82201a1cf6ef;hpb=30662a0d8af5ab5873ff7bdd7d59de52c1ce7fb5;p=dak.git diff --git a/dak/dak.py b/dak/dak.py old mode 100755 new mode 100644 index 0f228010..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,19 +49,19 @@ 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__ + 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] @@ -69,7 +69,7 @@ class UserExtension: return self._d.get(a, None) def __setattr__(self, a, v): - self._d[a] = v + self._d[a] = v ################################################################################ @@ -88,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", @@ -166,7 +166,7 @@ def init(): "Generate compatability symlinks from dists/ into pool/"), ] return functionality - + ################################################################################ def usage(functionality, exit_code=0): @@ -194,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