Merge branch 'psycopg2' into content_generation

[dak.git] / dak / dak.py

diff --git a/dak/dak.py b/dak/dak.py
index 5a986d55ef39cb11b20bef0246c97a36d9d43967..fc22ec5cda16394cdbdebf30bd453641f502045c 100755 (executable)
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -1,6 +1,11 @@
 #!/usr/bin/env python
 
-"""Wrapper to launch dak functionality"""
+"""
+Wrapper to launch dak functionality
+
+G{importgraph}
+
+"""
 # Copyright (C) 2005, 2006 Anthony Towns <ajt@debian.org>
 # Copyright (C) 2006 James Troup <james@nocrew.org>
 
@@ -88,6 +93,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"),
@@ -101,8 +108,12 @@ def init():
 
         ("make-suite-file-list",
          "Generate lists of packages per suite for apt-ftparchive"),
+        ("make-pkg-file-mapping",
+         "Generate package <-> file mapping"),
         ("generate-releases",
          "Generate Release files"),
+        ("generate-contents",
+         "Generate contest files"),
         ("generate-index-diffs",
          "Generate .diff/Index files"),
         ("clean-suites",
@@ -134,6 +145,8 @@ def init():
          "Check for users with no packages in the archive"),
         ("import-archive",
          "Populate SQL database based from an archive tree"),
+        ("import-contents",
+         "Populate SQL database with Contents files"),
         ("import-keyring",
          "Populate fingerprint/uid table based on a new/updated keyring"),
         ("import-ldap-fingerprints",
@@ -142,28 +155,26 @@ 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",
          "Generates Maintainers file for BTS etc"),
         ("make-overrides",
          "Generates override files"),
-        ("mirror-split",
-         "Split the pool/ by architecture groups"),
         ("poolize",
          "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/"),
+        ("bts-categorize",
+         "Categorize uncategorized bugs filed against ftp.debian.org"),
         ]
     return functionality
 
@@ -175,7 +186,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)