Modified method of printing variables.

Added to the variables used from the library module.
Самоукин Алексей 14 years ago
parent abb078aebe
commit ecb822e9b7

@ -39,13 +39,13 @@ class share_cmd(color_print, _error):
return False return False
def printVars(self, optObj): def printVars(self, optObj):
"""Process displaying variables""" """Печать переменных"""
if optObj.v: if optObj.v:
varsFilter = None varsFilter = None
varsNames = [] varsNames = []
format = "default" format = "default"
# Фильтрование переменных # Фильтрование переменных
if "filter" in optObj.__dict__.keys() and optObj.filter: if optObj.filter:
optCmd = optObj.filter optCmd = optObj.filter
if ',' in optCmd: if ',' in optCmd:
varsNames = optCmd.split(",") varsNames = optCmd.split(",")
@ -53,11 +53,16 @@ class share_cmd(color_print, _error):
varsFilter = optCmd.replace("*", ".*") varsFilter = optCmd.replace("*", ".*")
else: else:
varsNames.append(optCmd) varsNames.append(optCmd)
if "xml" in optObj.__dict__.keys() and optObj.xml: if optObj.xml:
format = "xml" format = "xml"
try:
v = int(optObj.v)
except:
v = 1
cl_overriding.exit = lambda x: "" cl_overriding.exit = lambda x: ""
self.logicObj.clVars.printVars(varsFilter, varsNames, self.logicObj.clVars.printVars(varsFilter, varsNames,
outFormat=format) outFormat=format,
verbose=v)
def setVars(self, optObj): def setVars(self, optObj):
"""Установка переменных""" """Установка переменных"""

@ -126,3 +126,14 @@ class Data:
'value':['/var/calculate/linux', 'value':['/var/calculate/linux',
'/var/calculate/remote/linux', '/var/calculate/remote/linux',
'/usr/calculate/share/linux']} '/usr/calculate/share/linux']}
# lib vars
cl_action = {}
cl_chroot_path = {}
cl_env_path = {}
cl_kernel_uid = {}
os_arch_machine = {}
os_linux_shortname = {}
os_linux_system = {}
os_root_dev = {}
os_root_type = {}
os_scratch = {}

Loading…
Cancel
Save