jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-24 11:46:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

motioneye: update some modules to use uppercase OS_ vars

Browse Source
This commit is contained in:
Calin Crisan 2019-01-13 11:10:45 +02:00
parent 14bfef5e8e
commit 379645fb15
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/motioneye/extractl.py
View File

@ -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')

2
package/motioneye/platformupdate.py
View File

@ -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():