]> git.decadent.org.uk Git - dak.git/commitdiff
fix reading $HOME/etc/dak/dak.conf
authorTorsten Werner <twerner@debian.org>
Mon, 19 Mar 2012 20:21:30 +0000 (21:21 +0100)
committerTorsten Werner <twerner@debian.org>
Mon, 19 Mar 2012 20:21:30 +0000 (21:21 +0100)
Previously the default_config would get loaded twice if $HOME/etc/dak/dak.conf
was found.

Signed-off-by: Arnd Hannemann <arnd@arndnet.de>
daklib/utils.py

index 9afd420e8d154f4824440c7c304812dadc0a68fa..38a987faf701f7e73d0f5a905e915b5f7858c9c8 100755 (executable)
@@ -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.