Merge remote branch 'ftpmaster/master'

[dak.git] / dak / dak.py

diff --git a/dak/dak.py b/dak/dak.py
index bd5108fa6e2e49607b2fc59050a43d95087e88c4..2a3c230893db82d7d3617dcdd7e964a93a2679e5 100755 (executable)
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -37,7 +37,6 @@ import os
 import sys
 import traceback
 import daklib.utils
-import warnings
 
 from daklib.daklog import Logger
 from daklib.config import Config
@@ -62,6 +61,8 @@ def init():
          "Output html for packages in NEW"),
         ("show-deferred",
          "Output html and symlinks for packages in DEFERRED"),
+        ("graph",
+         "Output graphs of number of packages in various queues"),
 
         ("rm",
          "Remove packages from suites"),
@@ -83,8 +84,12 @@ def init():
          "Generate Release files"),
         ("generate-packages-sources",
          "Generate Packages/Sources files"),
+        ("generate-packages-sources2",
+         "Generate Packages/Sources files [directly from database]"),
         ("contents",
          "Generate content files"),
+        ("metadata",
+         "Load data for packages/sources files"),
         ("generate-index-diffs",
          "Generate .diff/Index files"),
         ("clean-suites",
@@ -108,8 +113,6 @@ def init():
          "Manipulate suites in bulk"),
         ("cruft-report",
          "Check for obsolete or duplicated packages"),
-        ("decode-dot-dak",
-         "Display contents of a .dak file"),
         ("examine-package",
          "Show information useful for NEW processing"),
         ("find-null-maintainers",
@@ -122,8 +125,6 @@ def init():
          "Sync PostgreSQL users with passwd file"),
         ("admin",
          "Perform administration on the dak database"),
-        ("init-db",
-         "Update the database to match the conf file"),
         ("update-db",
          "Updates databae schema to latest revision"),
         ("init-dirs",
@@ -148,6 +149,12 @@ def init():
          "Add a user to the archive"),
         ("make-changelog",
          "Generate changelog between two suites"),
+        ("copy-installer",
+         "Copies the installer from one suite to another"),
+        ("override-disparity",
+         "Generate a list of override disparities"),
+        ("external-overrides",
+         "Modify external overrides"),
         ]
     return functionality
 
@@ -171,7 +178,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
 
@@ -209,10 +216,6 @@ def main():
                 daklib.utils.warn("unknown command '%s'" % (cmdname))
                 usage(functionality, 1)
 
-    # We do not care. No idea wth sqlalchemy warns about them, makes no sense,
-    # so we ignore it.
-    warnings.filterwarnings("ignore", 'Predicate of partial index')
-
     # Invoke the module
     module = __import__(cmdname.replace("-","_"))