Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  another merge failure

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index bc76fb0bdad66c56184e693f084d6b9647a39745..a40118d4969b8f90dbdb7252ce92355f0ab8ad35 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -123,6 +123,8 @@ def usage (exit_code=0):
 ################################################################################
 
 def action(u):
+    cnf = Config()
+
     # changes["distribution"] may not exist in corner cases
     # (e.g. unreadable changes files)
     if not u.pkg.changes.has_key("distribution") or not isinstance(u.pkg.changes["distribution"], DictType):