diff --git a/src/common/configpaths.py b/src/common/configpaths.py index 5d57bce32..9e18a18aa 100644 --- a/src/common/configpaths.py +++ b/src/common/configpaths.py @@ -150,7 +150,10 @@ class ConfigPaths: for name in d: d[name] += profile self.add(name, TYPE_DATA, windowsify(d[name])) - self.add('MY_DATA', TYPE_DATA, len(profile) ? 'data.dir' + profile : '') + if len(profile): + self.add('MY_DATA', TYPE_DATA, 'data.dir') + else: + self.add('MY_DATA', TYPE_DATA, '') d = {'CACHE_DB': 'cache.db', 'VCARD': 'vcards', 'AVATAR': 'avatars', @@ -158,13 +161,19 @@ class ConfigPaths: for name in d: d[name] += profile self.add(name, TYPE_CACHE, windowsify(d[name])) - self.add('MY_CACHE', TYPE_CACHE, len(profile) ? 'cache.dir' + profile : '') + if len(profile): + self.add('MY_CACHE', TYPE_CACHE, 'cache.dir') + else: + self.add('MY_CACHE', TYPE_CACHE, '') d = {'CONFIG_FILE': 'config', 'PLUGINS_CONFIG_DIR': 'pluginsconfig', 'MY_CERT': 'localcerts'} for name in d: d[name] += profile self.add(name, TYPE_CONFIG, windowsify(d[name])) - self.add('MY_CONFIG', TYPE_CONFIG, len(profile) ? 'config.dir' + profile : '') + if len(profile): + self.add('MY_CONFIG', TYPE_CONFIG, 'config.dir') + else: + self.add('MY_CONFIG', TYPE_CONFIG, '') basedir = fse(os.environ.get('GAJIM_BASEDIR', defs.basedir)) self.add('DATA', None, os.path.join(basedir, windowsify('data')))