From 379645fb15d4d4f78884c8bb62f809941ff684ce Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 13 Jan 2019 11:10:45 +0200 Subject: [PATCH] motioneye: update some modules to use uppercase OS_ vars --- package/motioneye/extractl.py | 12 ++++++------ package/motioneye/platformupdate.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/motioneye/extractl.py b/package/motioneye/extractl.py index d9a4d173f2..810938c893 100644 --- a/package/motioneye/extractl.py +++ b/package/motioneye/extractl.py @@ -148,7 +148,7 @@ def _get_os_settings(): except: continue - if name == 'os_prereleases': + if name == 'OS_PRERELEASES': prereleases = value == 'true' s = { @@ -184,11 +184,11 @@ def _set_os_settings(s): except: continue - if name == 'os_prereleases': - lines[i] = 'os_prereleases="%s"' % str(s.pop('prereleases')).lower() + if name == 'OS_PRERELEASES': + lines[i] = 'OS_PRERELEASES="%s"' % str(s.pop('prereleases')).lower() if 'prereleases' in s: - lines.append('os_prereleases="%s"' % str(s.pop('prereleases')).lower()) + lines.append('OS_PRERELEASES="%s"' % str(s.pop('prereleases')).lower()) with open(OS_CONF, 'w') as f: for line in lines: @@ -312,10 +312,10 @@ def _set_motioneye_settings(s): # also update debug in os.conf if debug: - cmd = "sed -i -r 's/os_debug=\"?false\"?/os_debug=\"true\"/' %s" % OS_CONF + cmd = "sed -i -r 's/OS_DEBUG=\"?false\"?/OS_DEBUG=\"true\"/' %s" % OS_CONF else: - cmd = "sed -i -r 's/os_debug=\"?true\"?/os_debug=\"false\"/' %s" % OS_CONF + cmd = "sed -i -r 's/OS_DEBUG=\"?true\"?/OS_DEBUG=\"false\"/' %s" % OS_CONF if os.system(cmd): logging.error('failed to set debug flag in os.conf') diff --git a/package/motioneye/platformupdate.py b/package/motioneye/platformupdate.py index bd223b40c5..b4e8e572bc 100644 --- a/package/motioneye/platformupdate.py +++ b/package/motioneye/platformupdate.py @@ -27,7 +27,7 @@ def get_os_version(): lines = [l.strip().split('=', 1) for l in lines] data = dict([(l[0], l[1].strip('"')) for l in lines]) - return (data['os_name'], data['os_version']) + return (data['OS_NAME'], data['OS_VERSION']) def get_all_versions():