From: Torsten Werner <twerner@debian.org>
Date: Mon, 19 Mar 2012 20:21:30 +0000 (+0100)
Subject: fix reading $HOME/etc/dak/dak.conf
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ce64b455cafe9267140c605f450222943682c4e3;p=dak.git

fix reading $HOME/etc/dak/dak.conf

Previously the default_config would get loaded twice if $HOME/etc/dak/dak.conf
was found.

Signed-off-by: Arnd Hannemann <arnd@arndnet.de>
---

diff --git a/daklib/utils.py b/daklib/utils.py
index 9afd420e..38a987fa 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -765,7 +765,7 @@ def which_conf_file ():
         homedir = os.getenv("HOME")
         confpath = os.path.join(homedir, "/etc/dak.conf")
         if os.path.exists(confpath):
-            apt_pkg.ReadConfigFileISC(Cnf,default_config)
+            apt_pkg.ReadConfigFileISC(Cnf,confpath)
 
     # We are still in here, so there is no local config file or we do
     # not allow local files. Do the normal stuff.