From da65d75d3d664fdc0ed52d85e1c285effadc3dbc Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 5 Sep 2015 00:52:14 +0300 Subject: [PATCH] it's friday night and I seem to have forgotten about python's non-local variables --- motioneye/meyectl.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/motioneye/meyectl.py b/motioneye/meyectl.py index 19a52f5..33157ba 100755 --- a/motioneye/meyectl.py +++ b/motioneye/meyectl.py @@ -64,10 +64,10 @@ def load_settings(): elif arg == '-d': debug = True - conf_path_given = False - run_path_given = False - log_path_given = False - media_path_given = False + conf_path_given = [False] + run_path_given = [False] + log_path_given = [False] + media_path_given = [False] # parse the config file, if given @@ -106,16 +106,16 @@ def load_settings(): value = float(value) if upper_name == 'CONF_PATH': - conf_path_given = True + conf_path_given[0] = True elif upper_name == 'RUN_PATH': - run_path_given = True + run_path_given[0] = True elif upper_name == 'LOG_PATH': - log_path_given = True + log_path_given[0] = True elif upper_name == 'MEDIA_PATH': - media_path_given = True + media_path_given[0] = True setattr(settings, upper_name, value) @@ -136,16 +136,16 @@ def load_settings(): # if not specified otherwise in the config file base_dir = os.path.dirname(config_file) - if not conf_path_given: + if not conf_path_given[0]: settings.CONF_PATH = base_dir - if not run_path_given: + if not run_path_given[0]: settings.RUN_PATH = base_dir - if not log_path_given: + if not log_path_given[0]: settings.LOG_PATH = base_dir - if not media_path_given: + if not media_path_given[0]: settings.MEDIA_PATH = base_dir else: -- 2.39.5