From d2568ecf8596563dfb9c80dfaf57855624b7f724 Mon Sep 17 00:00:00 2001
From: Mike Khiretskiy <mh@calculate.ru>
Date: Fri, 10 Oct 2014 13:55:20 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20ski?=
 =?UTF-8?q?p-setup-system=20=D0=B4=D0=BB=D1=8F=20cl-update-profile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/update/utils/cl_update_profile.py |  3 ++-
 pym/update/variables/update.py        | 12 ++++++++++++
 pym/update/wsdl_update.py             |  3 ++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pym/update/utils/cl_update_profile.py b/pym/update/utils/cl_update_profile.py
index 0ba4704..f56a5a6 100644
--- a/pym/update/utils/cl_update_profile.py
+++ b/pym/update/utils/cl_update_profile.py
@@ -112,7 +112,8 @@ class ClUpdateProfileAction(Action):
             {'name': 'reconfigure',
              'message': __("The system is being configured"),
              'method': 'Update.applyProfileTemplates(cl_template_clt_set,True,False)',
-             'condition': lambda Get: Get('cl_update_templates_locate')
+             'condition': lambda Get: (Get('cl_update_templates_locate') 
+                                 and Get('cl_update_skip_setup_set') == 'off')
             },
             {'name': 'dispatch_conf',
              'message': __("Updating configuration files"),
diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py
index 4b12825..5782a63 100644
--- a/pym/update/variables/update.py
+++ b/pym/update/variables/update.py
@@ -1060,3 +1060,15 @@ class VariableClUpdateLinesLimit(Variable):
     """
     type = "int"
     value = "30"
+
+class VariableClUpdateSkipSetupSet(Variable):
+    """
+    Пропустить выполнение cl-setup-system в cl-update-profile
+    """
+    type = "bool"
+    value = "off"
+    opt = ["--skip-setup-system"]
+
+    def init(self):
+        self.label = _("Skip the system setup")
+        self.help = _("skip the system setup")
diff --git a/pym/update/wsdl_update.py b/pym/update/wsdl_update.py
index fda1ea2..56aa599 100644
--- a/pym/update/wsdl_update.py
+++ b/pym/update/wsdl_update.py
@@ -119,7 +119,8 @@ class Wsdl(WsdlBase):
                 lambda group: group(_("Profile"),
                                     normal=('cl_update_profile_system',
                                             'cl_update_world'),
-                                    expert=('cl_update_templates_locate',
+                                    expert=('cl_update_skip_setup_set',
+                                            'cl_update_templates_locate',
                                             'cl_verbose_set',
                                             'cl_dispatch_conf'),
                                     hide=('cl_update_templates_locate',