Merge branch 'master' into content_generation

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b8560c5ef98d93b1c9efd26bfd866fb705edde5b..87e7788083168102bf5f8c1272b2c3c4a7221b55 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -716,5 +716,5 @@ Urgency
 Contents
 {
   Header "contents";
-  Root "/srv/ftp.debian.org/ftp/";
-}
\ No newline at end of file
+  Root "/srv/ftp.debian.org/test/";
+}

diff --git a/dak/bts_categorize.py b/dak/bts_categorize.py
index 1e0349d0d0ebb67ed9381a9abf9fe856033e05cc..663690a1973d9e767c71147bba66dd9c44e50a1b 100755 (executable)
--- a/dak/bts_categorize.py
+++ b/dak/bts_categorize.py
@@ -128,7 +128,7 @@ class BugClassifier(object):
 
             return controls
         except:
-            log.error("couldn't retreive bugs from soap interface: %s" % sys.exc_info()[0])
+            log.error("couldn't retrieve bugs from soap interface: %s" % sys.exc_info()[0])
             return None
 
 def send_email(commands, simulate=False):