From 45db5e1be0b1d484dc8c7fc4a9cd7f7e81962bd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?=
 =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?=
 <mhiretskiy@asamoukin.local.calculate.ru>
Date: Mon, 26 Jul 2010 16:37:05 +0000
Subject: [PATCH] Fix cl_calculate -v perform. Fix --ntp and --proxy opts.

---
 pym/cl_apply_template.py | 6 +++---
 pym/cl_install_cmd.py    | 2 ++
 pym/cl_share_cmd.py      | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pym/cl_apply_template.py b/pym/cl_apply_template.py
index 853e6ca..6c87e2e 100644
--- a/pym/cl_apply_template.py
+++ b/pym/cl_apply_template.py
@@ -112,12 +112,12 @@ subdirectories %s")%', '.join(dirsTemplates))
         self.printWARNING(" "*5 + nameFile)
         return True
 
-    def printVars(self, opts):
+    def printVars(self, opts=["all"]):
         """Печать существующих переменных"""
         if opts == ["all"]:
             self.clVars.printVars()
         else:
-            self.clVars.printVars(opts)
+            self.clVars.printVars()
 
     def applyAllTemplates(self):
         """Обновление конфигурационных файлов"""
@@ -175,4 +175,4 @@ subdirectories %s")%', '.join(dirsTemplates))
                     if nameFile[:1] != "/":
                         nameFile = "/" + nameFile
                     self.printWARNING(" "*5 + nameFile)
-        return True
\ No newline at end of file
+        return True
diff --git a/pym/cl_install_cmd.py b/pym/cl_install_cmd.py
index 087aa93..185cd80 100644
--- a/pym/cl_install_cmd.py
+++ b/pym/cl_install_cmd.py
@@ -72,9 +72,11 @@ CMD_OPTIONS = [{'shortOption':"d",
                 'help':_("configure current system")
                },
                {'longOption':"proxy",
+                'optVal':"PROXY",
                 'help':_("set proxy server for system")
                },
                {'longOption':"ntp",
+                'optVal':"NTP",
                 'help':_("set ntp server for system")
                }
                ]
diff --git a/pym/cl_share_cmd.py b/pym/cl_share_cmd.py
index 747a661..83a8690 100644
--- a/pym/cl_share_cmd.py
+++ b/pym/cl_share_cmd.py
@@ -28,7 +28,7 @@ class share_cmd(color_print, _error):
     def printVars(self, optObj):
         """Печать переменных"""
         if optObj.v:
-            self.printVars()
+            self.logicObj.printVars()
 
     def setVars(self, optObj):
         """Установка переменных"""