Merge remote branch 'mhy/master'

diff --git a/dak/examine_package.py b/dak/examine_package.py
index 5cb1a77e9a6fb8dcbd3e62d511056d4dfe08edd8..8e2ce20b987135538e4a0d76cab2be7a8df72665 100755 (executable)
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -65,6 +65,7 @@ from daklib.gpg import SignedFile
 from daklib.regexes import html_escaping, re_html_escaping, re_version, re_spacestrip, \
                            re_contrib, re_nonfree, re_localhost, re_newlinespace, \
                            re_package, re_doc_directory
+from daklib.dak_exceptions import ChangesUnicodeError
 
 ################################################################################
 

diff --git a/daklib/queue.py b/daklib/queue.py
index 35d47429858e69613b50e1eebaf03e41f28594d1..c2f0414f6e31adb42402376a928e30787bf1405a 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -1318,8 +1318,8 @@ class Upload(object):
         # Extract the source
         try:
             unpacked = UnpackedSource(dsc_filename)
-        except:
-            self.rejects.append("'dpkg-source -x' failed for %s." % dsc_filename)
+        except Exception, e:
+            self.rejects.append("'dpkg-source -x' failed for %s. (%s)" % (dsc_filename, str(e)))
             return
 
         if not cnf.Find("Dir::BTSVersionTrack"):

diff --git a/setup/core-init.d/060_archive b/setup/core-init.d/060_archive
index 29383442a718a59b57d97e3bf4fa7e9df37d2af8..a2d28e895bfc3eee45c68431a7c21f67b38c49c1 100755 (executable)
--- a/setup/core-init.d/060_archive
+++ b/setup/core-init.d/060_archive
@@ -3,7 +3,7 @@
 set -e
 set -u
 
-POOLPATH="${DAKBASE}/ftp/pool"
+POOLPATH="${DAKBASE}/ftp/pool/"
 
 echo "Setting up archive and locations"
 psql -c "INSERT INTO archive (name, origin_server, description)

diff --git a/setup/dak-minimal.conf.template b/setup/dak-minimal.conf.template
index 7b4f9d254a8ca302185b0923db176e56a80b208d..42c6881dbc23132241ccbef85ed73ec37bf225ea 100644 (file)
--- a/setup/dak-minimal.conf.template
+++ b/setup/dak-minimal.conf.template
@@ -48,6 +48,7 @@ Dir
   Holding "__DAKBASE__/holding/";
   Done "__DAKBASE__/done/";
   Reject "__DAKBASE__/reject/";
+  TempPath "__DAKBASE__/tmp/";
 };
 
 Urgency