Merge remote branch 'mhy/psimport' into merge

[dak.git] / dak / dak.py

diff --git a/dak/dak.py b/dak/dak.py
index fb0021024505b971819647ba7c155e57a49e9fee..ad99a5a06c80b5c4e383dad854583d5ae67b2a15 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"),
@@ -85,6 +86,8 @@ def init():
          "Generate Packages/Sources files"),
         ("contents",
          "Generate content files"),
+        ("metadata",
+         "Load data for packages/sources files"),
         ("generate-index-diffs",
          "Generate .diff/Index files"),
         ("clean-suites",
@@ -209,10 +212,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("-","_"))