Changeset 2ff0f37 for protocols

Timestamp:

2011-06-29T23:25:02Z (13 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

66911fc

Parents:

bf8ee39

Message:

skyped: user configuration should have priority

File:

• protocols/skype/skyped.py (modified) (1 diff)

protocols/skype/skyped.py

@@ -336 +336 @@
         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