X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/763d5e6ad88ef3ba1cd1d7742d060e4f1e54c6b8..0db97c0d2f4568c2b5b5f5f9b791b8025b4732aa:/python/disorder.py.in diff --git a/python/disorder.py.in b/python/disorder.py.in index eb58507..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'