diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2011-06-30 01:25:02 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2011-06-30 01:25:02 +0200 |
| commit | 2ff0f378570177fe42e4bf48b63bea52369f80e8 (patch) | |
| tree | 10127083f8f47953f3c92401e97974863b63bb1b /protocols | |
| parent | bf8ee3981b4de9f3dccf6dd374147c5a6d92a167 (diff) | |
skyped: user configuration should have priority
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/skype/skyped.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |