Rename action variables.

netsetup
Mike Hiretsky 13 years ago
parent 7669e640d1
commit 0812dbeb43

@ -62,7 +62,7 @@ class fillVars(object, glob_attr):
except:
pass
def get_cl_install_merge_action(self):
def get_ac_install_merge(self):
"""Need perform templates for install:merge or install:unmerge"""
actionsMap = {'merge':'up',
'system':'up'}
@ -72,7 +72,7 @@ class fillVars(object, glob_attr):
return ""
return actionsMap[cl_action] if cl_action in actionsMap else ""
def get_cl_install_system_action(self):
def get_ac_install_system(self):
"""Need perform templates for install:system"""
if self.Get('cl_action') == 'system' and \
self.Get('os_install_root_type') != "flash":
@ -80,7 +80,7 @@ class fillVars(object, glob_attr):
else:
return ""
def get_cl_install_flash_action(self):
def get_ac_install_flash(self):
"""Need perform templates for install:flash"""
actionsMap = {'system':'up'}
clAction = self.Get('cl_action')
@ -1229,7 +1229,7 @@ class fillVars(object, glob_attr):
return ""
def get_cl_install_autoupdate_set(self):
if self.Get('cl_install_system_action') == "up":
if self.Get('ac_install_system') == "up":
if self.Get('os_install_linux_system') == 'desktop':
return "on"
else:

@ -32,13 +32,13 @@ class Data:
cl_ver = {'value':__version__}
# need perform templates for install:merge or install:unmerge
cl_install_merge_action = {}
ac_install_merge = {}
# need perform templates for install:system
cl_install_system_action = {}
ac_install_system = {}
# need perform templates for install:flash
cl_install_flash_action = {}
ac_install_flash = {}
# install maching architecture
os_install_arch_machine = {'mode':'w'}

Loading…
Cancel
Save