From: Mike O'Connor <stew@vireo.org>
Date: Fri, 13 Mar 2009 16:17:45 +0000 (-0400)
Subject: Merge branch 'master' into content_generation
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=870993b63b9296e3ea1f8b03099657cbab8c99e0;hp=816c80eb6a29a98b704ea31b67c791ea2b156d92;p=dak.git

Merge branch 'master' into content_generation
---

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b8560c5e..87e77880 100644
--- 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 1e0349d0..663690a1 100755
--- 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):