From 6cb0924ffa2d3bbbc2837a7d0d2a6a5cf1d29493 Mon Sep 17 00:00:00 2001 From: Paul Lecuq Date: Mon, 29 Feb 2016 10:19:39 +0100 Subject: [PATCH] Config file loading bug added /etc as a path --- py-squid-blacklists.py | 2 +- pysquidblacklists/pysquidblacklists.py | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/py-squid-blacklists.py b/py-squid-blacklists.py index 49794fe..43dfb74 100755 --- a/py-squid-blacklists.py +++ b/py-squid-blacklists.py @@ -2,7 +2,7 @@ from pysquidblacklists import * config = PySquidBlacklistsConfig() -config.get_config() +config.get_config(__file__) bli = PySquidBlacklistsImporter(config) bl = PySquidBlacklistsRunner(config, bli) diff --git a/pysquidblacklists/pysquidblacklists.py b/pysquidblacklists/pysquidblacklists.py index 6be6e9e..e385072 100644 --- a/pysquidblacklists/pysquidblacklists.py +++ b/pysquidblacklists/pysquidblacklists.py @@ -122,8 +122,8 @@ class PySquidBlacklistsConfig: self.config = configparser.RawConfigParser() self.config_path = None - def get_config(self): - self.get_path() + def get_config(self, pwd): + self.get_path(pwd) self.config.read(self.config_path) self.url = str(self.config.get("main", "url")) self.filename = self.url.split("/").pop() @@ -138,11 +138,14 @@ class PySquidBlacklistsConfig: def set_config(self, section, attr): self.config.set(section, attr) - def get_path(self): + def get_path(self, pwd): filename = "py-squid-blacklists.conf" - config_path = "%s/%s" % (os.path.dirname(os.path.abspath(__name__)), filename) + config_path = "%s/%s" % (os.path.dirname(os.path.abspath(pwd)), filename) + default_config_path = "/etc/%s" % filename if os.path.exists(config_path): self.config_path = config_path + elif os.path.exists(default_config_path): + self.config_path = default_config_path else: - exit("No config file available at common paths. Must initialize it") + exit("No config file available at common paths (current dir or /etc). Must initialize it")