Merge remote-tracking branch 'dktrkranz/fixes'

[dak.git] / dak / dak.py

diff --git a/dak/dak.py b/dak/dak.py
index b8b9f62d651307ba47f79176fc1c052e54c78b52..c6c979a72e0f6f944ac17734318821faaab96785 100755 (executable)
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -71,21 +71,23 @@ def init():
          "Process NEW and BYHAND packages"),
         ("process-upload",
          "Process packages in queue/unchecked"),
+        ("process-commands",
+         "Process command files (*.dak-commands)"),
         ("process-policy",
          "Process packages in policy queues from COMMENTS files"),
 
         ("dominate",
          "Remove obsolete source and binary associations from suites"),
+        ("export",
+         "Export uploads from policy queues"),
+        ("export-suite",
+         "export a suite to a flat directory structure"),
         ("make-pkg-file-mapping",
          "Generate package <-> file mapping"),
-        ("generate-filelist",
-         "Generate file lists for apt-ftparchive"),
         ("generate-releases",
          "Generate Release files"),
-        ("generate-packages-sources",
-         "Generate Packages/Sources files"),
         ("generate-packages-sources2",
-         "Generate Packages/Sources files [directly from database]"),
+         "Generate Packages/Sources files"),
         ("contents",
          "Generate content files"),
         ("metadata",
@@ -98,31 +100,31 @@ def init():
          "Clean and update metadata for build queues"),
         ("clean-queues",
          "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",
-         "Dependency checking for proposed-updates"),
         ("control-overrides",
          "Manipulate/list override entries in bulk"),
         ("control-suite",
          "Manipulate suites in bulk"),
+        ("update-suite",
+         "Update suite with packages from a different suite"),
         ("cruft-report",
          "Check for obsolete or duplicated packages"),
+        ("auto-decruft",
+         "Clean cruft without reverse dependencies automatically"),
         ("examine-package",
          "Show information useful for NEW processing"),
-        ("find-null-maintainers",
-         "Check for users with no packages in the archive"),
+        ("import",
+         "Import existing source and binary packages"),
         ("import-keyring",
          "Populate fingerprint/uid table based on a new/updated keyring"),
-        ("import-ldap-fingerprints",
-         "Syncs fingerprint and uid tables with Debian LDAP db"),
         ("import-users-from-passwd",
          "Sync PostgreSQL users with passwd file"),
+        ("acl",
+         "Manage upload ACLs"),
         ("admin",
          "Perform administration on the dak database"),
         ("update-db",
@@ -133,18 +135,12 @@ def init():
          "Generates Maintainers file for BTS etc"),
         ("make-overrides",
          "Generates override files"),
-        ("poolize",
-         "Move packages from dists/ to pool/"),
         ("new-security-install",
          "New way to install a security upload into the archive"),
-        ("split-done",
-         "Split queue/done into a date-based hierarchy"),
         ("stats",
          "Generate statistics"),
         ("bts-categorize",
          "Categorize uncategorized bugs filed against ftp.debian.org"),
-        ("import-known-changes",
-         "import old changes files into known_changes table"),
         ("add-user",
          "Add a user to the archive"),
         ("make-changelog",
@@ -178,7 +174,7 @@ def main():
 
 
     try:
-        logger = Logger(Config(), 'dak top-level', print_starting=False)
+        logger = Logger('dak top-level', print_starting=False)
     except CantOpenError:
         logger = None