Merge branch 'master' into content_generation

[dak.git] / dak / dak.py

diff --git a/dak/dak.py b/dak/dak.py
index 5a986d55ef39cb11b20bef0246c97a36d9d43967..92753ecc81d94004ee2b88db7822b68915a365a3 100755 (executable)
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -88,6 +88,8 @@ 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"),
@@ -103,6 +105,8 @@ def init():
          "Generate lists of packages per suite for apt-ftparchive"),
         ("generate-releases",
          "Generate Release files"),
+        ("generate-contents",
+         "Generate contest files"),
         ("generate-index-diffs",
          "Generate .diff/Index files"),
         ("clean-suites",
@@ -142,6 +146,8 @@ def init():
          "Sync PostgreSQL users with passwd file"),
         ("init-db",
          "Update the database to match the conf file"),
+        ("update-db",
+         "Updates databae schema to latest revision"),
         ("init-dirs",
          "Initial setup of the archive"),
         ("make-maintainers",
@@ -154,16 +160,12 @@ def init():
          "Move packages from dists/ to pool/"),
         ("reject-proposed-updates",
          "Manually reject from proposed-updates"),
-        ("security-install",
-         "Install a security upload into the archive"),
         ("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"),
-        ("symlink-dists",
-         "Generate compatability symlinks from dists/ into pool/"),
         ]
     return functionality
 
@@ -175,7 +177,7 @@ def usage(functionality, exit_code=0):
     print """Usage: dak COMMAND [...]
 Run DAK commands.  (Will also work if invoked as COMMAND.)
 
-Availble commands:"""
+Available commands:"""
     for (command, description) in functionality:
         print "  %-23s %s" % (command, description)
     sys.exit(exit_code)