From bf5f46c3d597c3914ba8fa138e172aa5db10ede2 Mon Sep 17 00:00:00 2001 From: Steven Hiscocks Date: Wed, 30 Jan 2013 19:57:03 +0000 Subject: [PATCH] Warn if config file present but unreadable --- client/configreader.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/client/configreader.py b/client/configreader.py index 063484e8..e435b254 100644 --- a/client/configreader.py +++ b/client/configreader.py @@ -59,6 +59,16 @@ class ConfigReader(SafeConfigParserWithIncludes): bConf = basename + ".conf" bLocal = basename + ".local" if os.path.exists(bConf) or os.path.exists(bLocal): + if not os.access(bConf, os.R_OK) and not os.access(bLocal, os.R_OK): + logSys.warning( + "Unable to read either \"%s\" or \"%s\"" % (bConf, bLocal)) + return False + elif os.path.exists(bConf) and not os.access(bConf, os.R_OK): + logSys.warning( + "\"%s\" read, but unable to read \"%s\"" % (bLocal, bConf)) + elif os.path.exists(bLocal) and not os.access(bLocal, os.R_OK): + logSys.warning( + "\"%s\" read, but unable to read \"%s\"" % (bConf, bLocal)) SafeConfigParserWithIncludes.read(self, [bConf, bLocal]) return True else: