From: Joerg Jaspert <joerg@debian.org>
Date: Sun, 19 Apr 2009 16:41:01 +0000 (+0200)
Subject: which_conf_file
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=8752b2fed37bee42a2ce7046385e99ff5035c37c;p=dak.git

which_conf_file

we should not return the path, but just set the Cnf values to whatever is
in that local config file, so that can point to the right dak.conf then.
and, as that will be different from default "/etc/dak/dak.conf" then let
the usual process read in our different config files

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

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