Revert "Revert "Merge commit 'stew/content_generation' into merge""

[dak.git] / dak / dak.py

diff --git a/dak/dak.py b/dak/dak.py
index 422fe97a7b9f93dfbe13e0d26b8161620269e1c6..61749490935a77f0fbb6fbddadd66c50243002ad 100755 (executable)
--- a/dak/dak.py
+++ b/dak/dak.py
@@ -33,8 +33,10 @@ G{importgraph}
 
 ################################################################################
 
-import sys, imp
-import daklib.utils, daklib.extensions
+import sys
+import imp
+import daklib.utils
+import daklib.extensions
 
 ################################################################################
 
@@ -108,8 +110,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"),
+        ("contents",
+         "Generate content files"),
         ("generate-index-diffs",
          "Generate .diff/Index files"),
         ("clean-suites",
@@ -169,6 +175,8 @@ def init():
          "Generate statistics"),
         ("bts-categorize",
          "Categorize uncategorized bugs filed against ftp.debian.org"),
+        ("add-user",
+         "Add a user to the archive"),
         ]
     return functionality