calculate/calculate-utils-2.1-lib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Исправлено использование /var/lib/calculate/calculate.env

Browse source
This commit is contained in:
Хирецкий Михаил 2016-12-19 13:06:25 +03:00
parent bad3ec44ce
commit 2e08c91e33
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pym/cl_base.py
View file

@ -880,7 +880,7 @@ class DataVars(object):
# получаем полный путь до файла ini
if location == 'default':
name_calculate_ini = calculate_ini[3]
if location == 'custom':
elif location == 'custom':
name_calculate_ini = calculate_ini[2]
elif location == 'local':
name_calculate_ini = calculate_ini[1]
@ -921,7 +921,7 @@ class DataVars(object):
# получаем полный путь до файла ini
if location == 'default':
name_calculate_ini = calculate_ini[3]
if location == 'custom':
elif location == 'custom':
name_calculate_ini = calculate_ini[2]
elif location == 'local':
name_calculate_ini = calculate_ini[1]
@ -1033,7 +1033,7 @@ class DataVars(object):
value = cl_utils.convertStrListDict(v.encode("UTF-8"))
self.Set(k, value, True)
importFileVars[k] = value
if i < 3:
if i < 4:
importVars[locations[i]] = importFileVars
i += 1
return importVars