From: Mark Hymers <mhy@debian.org>
Date: Mon, 26 Oct 2009 13:38:15 +0000 (+0000)
Subject: another merge failure
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=4f388f061e9e266474ba4a91c54e27e6b0907855;p=dak.git

another merge failure

Signed-off-by: Mark Hymers <mhy@debian.org>
---

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index bc76fb0b..a40118d4 100755
--- 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):