suite_id

[dak.git] / daklib / utils.py

diff --git a/daklib/utils.py b/daklib/utils.py
index cb7efbea9c313767f5b98923bd89efdfce4bca04..c40fe8e0efafcde03c217151f647c1a1672e3f97 100755 (executable)
--- 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.
@@ -761,6 +761,13 @@ def which_conf_file ():
 
 def which_apt_conf_file ():
     res = socket.gethostbyaddr(socket.gethostname())
+    # In case we allow local config files per user, try if one exists
+    if Cnf.FindB("Config::" + res[0] + "::AllowLocalConfig"):
+        homedir = os.getenv("HOME")
+        confpath = os.path.join(homedir, "/etc/dak.conf")
+        if os.path.exists(confpath):
+            apt_pkg.ReadConfigFileISC(Cnf,default_config)
+
     if Cnf.get("Config::" + res[0] + "::AptConfig"):
         return Cnf["Config::" + res[0] + "::AptConfig"]
     else: