X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=01ed2ede03e0ef281a2261813c0a2c943732d4d2;hb=8752b2fed37bee42a2ce7046385e99ff5035c37c;hp=651e13ae7b6ac507ef468bda804df4f047a0b51c;hpb=b6ab6dd2d291f00ef2a5bca1ecad6191182b6505;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index 651e13ae..01ed2ede 100755 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -745,6 +745,15 @@ def where_am_i (): def which_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) + + # We are still in here, so there is no local config file or we do + # not allow local files. Do the normal stuff. if Cnf.get("Config::" + res[0] + "::DakConfig"): return Cnf["Config::" + res[0] + "::DakConfig"] else: