From af4f9235275fa35d37e8751105755a1836de273f Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Wed, 7 Nov 2012 20:48:07 +0100 Subject: [PATCH] Fixed KeyError in main.py. --- openslides/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openslides/main.py b/openslides/main.py index c5313fbc2..3923c5f52 100644 --- a/openslides/main.py +++ b/openslides/main.py @@ -102,8 +102,8 @@ def main(argv=None, opt_defaults=None): # Find the path to the settings settings_path = opts.settings if settings_path is None: - config_home = os.environ['XDG_CONFIG_HOME'] or \ - os.path.join(os.path.expanduser('~'), '.config') + config_home = os.environ.get('XDG_CONFIG_HOME', \ + os.path.join(os.path.expanduser('~'), '.config')) settings_path = os.path.join(config_home, 'openslides_config', 'settings.py') # Create settings if necessary @@ -143,8 +143,8 @@ def create_settings(settings_path, database_path=None): settings_file = os.path.basename(settings_path) if database_path is None: - data_home = os.environ['XDG_DATA_HOME'] or \ - os.path.join(os.path.expanduser('~'), '.local', 'share') + data_home = os.environ.get('XDG_DATA_HOME', \ + os.path.join(os.path.expanduser('~'), '.local', 'share')) database_path = os.path.join(data_home, 'openslides_data', 'database.sqlite') settings_content = CONFIG_TEMPLATE % dict(