X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/460b9539a7c15580e41a71bbc0f47ae776238915..0db97c0d2f4568c2b5b5f5f9b791b8025b4732aa:/python/disorder.py.in diff --git a/python/disorder.py.in b/python/disorder.py.in index dfaddbf..5becda1 100644 --- a/python/disorder.py.in +++ b/python/disorder.py.in @@ -53,6 +53,7 @@ import locale _configfile = "pkgconfdir/config" _dbhome = "pkgstatedir" +_userconf = True # various regexps we'll use _ws = re.compile(r"^[ \t\n\r]+") @@ -291,7 +292,7 @@ class client: self._readfile(_configfile) if os.path.exists(privconf): self._readfile(privconf) - if os.path.exists(passfile): + if os.path.exists(passfile) and _userconf: self._readfile(passfile) self.state = 'disconnected' @@ -1042,4 +1043,3 @@ class monitor: # comment-column:40 # fill-column:72 # End: -# arch-tag:eea975737c837febf73a000630b5ecc4