Merge branch 'master' into content_generation, make changes based on Joerg's review

[dak.git] / dak / dak.py

diff --git a/dak/dak.py b/dak/dak.py
index 981a31a95d0d52e6408c458218c012726a8229bd..14cddd562545f9449d86c62c5a107f3c8db8afe2 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
 
 ################################################################################
 
@@ -112,6 +114,8 @@ def init():
          "Generate package <-> file mapping"),
         ("generate-releases",
          "Generate Release files"),
+        ("contents",
+         "Generate content files"),
         ("generate-index-diffs",
          "Generate .diff/Index files"),
         ("clean-suites",
@@ -169,6 +173,8 @@ def init():
          "Split queue/done into a date-based hierarchy"),
         ("stats",
          "Generate statistics"),
+        ("calculate-shasums",
+         "Calculate missing sha1sums and sha256sums"),
         ("bts-categorize",
          "Categorize uncategorized bugs filed against ftp.debian.org"),
         ("add-user",