From 2ff0f378570177fe42e4bf48b63bea52369f80e8 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 30 Jun 2011 01:25:02 +0200 Subject: skyped: user configuration should have priority --- protocols/skype/skyped.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'protocols') diff --git a/protocols/skype/skyped.py b/protocols/skype/skyped.py index c9bfc2ce..615d6835 100644 --- a/protocols/skype/skyped.py +++ b/protocols/skype/skyped.py @@ -335,9 +335,9 @@ class SkypeApi: class Options: def __init__(self): self.cfgpath = os.path.join(os.environ['HOME'], ".skyped", "skyped.conf") - # for backwards compatibility + # fall back to system-wide settings self.syscfgpath = "/usr/local/etc/skyped/skyped.conf" - if os.path.exists(self.syscfgpath): + if os.path.exists(self.syscfgpath) and not os.path.exists(self.cfgpath): self.cfgpath = self.syscfgpath self.daemon = True self.debug = False -- cgit v1.2.3