From: Mike O'Connor <stew@vireo.org>
Date: Wed, 18 Feb 2009 13:56:09 +0000 (-0500)
Subject: merge from master
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9f371390bb90395b2f2f0b65c91c21047896774a;p=dak.git

merge from master

Signed-off-by: Mike O'Connor <stew@vireo.org>
---

9f371390bb90395b2f2f0b65c91c21047896774a
diff --cc dak/dak.py
index aa6efdee,981a31a9..15c3e1ad
--- a/dak/dak.py
+++ b/dak/dak.py
@@@ -171,10 -169,10 +171,12 @@@ 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",
+          "Add a user to the archive"),
          ]
      return functionality
  
diff --cc daklib/utils.py
index 5cb502d6,cb5df31c..1b35feef
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@@ -37,7 -37,9 +37,10 @@@ import sta
  import apt_pkg
  import database
  import time
 +import tarfile
+ import re
+ import string
+ import email as modemail
  from dak_exceptions import *
  from regexes import re_html_escaping, html_escaping, re_single_line_field, \
                      re_multi_line_field, re_srchasver, re_verwithext, \