diff options
author | Kali Kaneko <kali@leap.se> | 2013-09-09 18:27:09 +0200 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2013-09-09 18:27:09 +0200 |
commit | a7d8cbb050b10b6f45913e04800d6209c90dd4a4 (patch) | |
tree | ab25d6e5a3c9ac6830a07e2f231045a2a3bb3f1c /src/leap/bitmask/config/leapsettings.py | |
parent | b90f6525b13657b6ed845c56d1b8f6a101ce8e33 (diff) | |
parent | e1ba124417ff76580d64f331d38759dcf8bb3f46 (diff) |
Merge remote-tracking branch 'ivan-github/bug/3778_bundle-path-prefix' into develop
Diffstat (limited to 'src/leap/bitmask/config/leapsettings.py')
-rw-r--r-- | src/leap/bitmask/config/leapsettings.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/leap/bitmask/config/leapsettings.py b/src/leap/bitmask/config/leapsettings.py index ad67b29e..7d8b5977 100644 --- a/src/leap/bitmask/config/leapsettings.py +++ b/src/leap/bitmask/config/leapsettings.py @@ -75,12 +75,12 @@ class LeapSettings(object): """ Constructor - :param standalone: parameter used to define the location of - the config + :param standalone: parameter used to define the location of the config. :type standalone: bool """ - settings_path = os.path.join( - get_path_prefix(standalone=standalone), "leap", self.CONFIG_NAME) + self._path_prefix = get_path_prefix(standalone=standalone) + settings_path = os.path.join(self._path_prefix, + "leap", self.CONFIG_NAME) self._settings = QtCore.QSettings(settings_path, QtCore.QSettings.IniFormat) @@ -132,8 +132,8 @@ class LeapSettings(object): # other things, not just the directories providers = [] try: - providers_path = os.path.join( - get_path_prefix(), "leap", "providers") + providers_path = os.path.join(self._path_prefix, + "leap", "providers") providers = os.listdir(providers_path) except Exception as e: logger.debug("Error listing providers, assume there are none. %r" |