From 9621c134b4b77f1e99eae82d99d94d2e38504fad 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?= <mh@calculate.ru>
Date: Fri, 19 Aug 2016 17:04:36 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D1=81=D0=B2=D1=8F=D0=B7=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D1=81?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D1=80=D1=8F=D0=B4=D0=BA=D0=BE=D0=BC=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=88?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=BE=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/client/variables/action.py | 36 ++++------------------------------
 pym/client/wsdl_client.py      |  1 -
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/pym/client/variables/action.py b/pym/client/variables/action.py
index b84287f..76dd8cd 100644
--- a/pym/client/variables/action.py
+++ b/pym/client/variables/action.py
@@ -22,43 +22,15 @@ from calculate.lib.cl_lang import setLocalTranslate
 setLocalTranslate('cl_client3', sys.modules[__name__])
 
 
-class VariableAcClientMerge(ActionVariable):
-    """
-    Action variable which has value "up" for package install and
-    install this package
-    """
-    nonchroot = True
-
-    def action(self, cl_action):
-        if cl_action in ("merge", "domain", "undomain"):
-            return "on"
-        return "off"
-
-
-class VariableAcClientDomain(ActionVariable):
+class VariableAcClientConfigure(ActionVariable):
     """
     Action variable which has value "on" for domain action
     """
     nonchroot = True
 
     def action(self, cl_action):
-        remoteHost = self.Get("cl_remote_host")
-        remoteAuth = self.Get("os_remote_auth")
-        if cl_action == "domain":
+        if cl_action in ("domain", "undomain"):
             return "on"
-        elif ((cl_action in ("merge", 'sync') and self.Get('cl_merge_pkg'))
-              and remoteHost and remoteAuth):
-            return "on"
-        return "off"
-
-
-class VariableAcClientUndomain(ActionVariable):
-    """
-    Action variable which has value "on" for undomain action
-    """
-    nonchroot = True
+        else:
+            return "off"
 
-    def action(self, cl_action):
-        if cl_action in ("undomain",):
-            return "on"
-        return "off"
diff --git a/pym/client/wsdl_client.py b/pym/client/wsdl_client.py
index a3d22c6..f14fb51 100644
--- a/pym/client/wsdl_client.py
+++ b/pym/client/wsdl_client.py
@@ -64,7 +64,6 @@ class Wsdl(WsdlBase):
                              ClientError, DesktopError),
             # значения по умолчанию для переменных этого метода
             'setvars': {'cl_action!': 'domain',
-                        'cl_protect_use_set!': 'off'
                         },
             'guivars': {'cl_localhost_set!': lambda dv: (
                 "on" if dv.Get('cl_remote_host') == '' else 'off')},