]> git.decadent.org.uk Git - dak.git/commitdiff
which_conf_file
authorJoerg Jaspert <joerg@debian.org>
Sun, 19 Apr 2009 16:41:01 +0000 (18:41 +0200)
committerJoerg Jaspert <joerg@debian.org>
Sun, 19 Apr 2009 16:41:01 +0000 (18:41 +0200)
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>
daklib/utils.py

index cb7efbea9c313767f5b98923bd89efdfce4bca04..01ed2ede03e0ef281a2261813c0a2c943732d4d2 100755 (executable)
@@ -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.