diff --git a/pym/cl_share_cmd.py b/pym/cl_share_cmd.py index 6f662f6..2a70f87 100644 --- a/pym/cl_share_cmd.py +++ b/pym/cl_share_cmd.py @@ -39,13 +39,13 @@ class share_cmd(color_print, _error): return False def printVars(self, optObj): - """Process displaying variables""" + """Печать переменных""" if optObj.v: varsFilter = None varsNames = [] format = "default" # Фильтрование переменных - if "filter" in optObj.__dict__.keys() and optObj.filter: + if optObj.filter: optCmd = optObj.filter if ',' in optCmd: varsNames = optCmd.split(",") @@ -53,11 +53,16 @@ class share_cmd(color_print, _error): varsFilter = optCmd.replace("*", ".*") else: varsNames.append(optCmd) - if "xml" in optObj.__dict__.keys() and optObj.xml: + if optObj.xml: format = "xml" + try: + v = int(optObj.v) + except: + v = 1 cl_overriding.exit = lambda x: "" self.logicObj.clVars.printVars(varsFilter, varsNames, - outFormat=format) + outFormat=format, + verbose=v) def setVars(self, optObj): """Установка переменных""" diff --git a/pym/cl_vars_builder.py b/pym/cl_vars_builder.py index 25b5edd..c39ef01 100644 --- a/pym/cl_vars_builder.py +++ b/pym/cl_vars_builder.py @@ -126,3 +126,14 @@ class Data: 'value':['/var/calculate/linux', '/var/calculate/remote/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 = {}