From c1ec3af29b10fa76fcdabb7085d815d8e528a7b8 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: Tue, 2 May 2017 11:07:54 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BE=D0=B1=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

При попытки одновременного использования параметров авторазметки и ручной разметки выдавались не информативные сообщения, вместо сообщения о несовместимости опций.
---
 pym/install/variables/disk.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pym/install/variables/disk.py b/pym/install/variables/disk.py
index dd5ef97..ab74f93 100644
--- a/pym/install/variables/disk.py
+++ b/pym/install/variables/disk.py
@@ -1009,6 +1009,8 @@ class VariableOsLocationDest(LocationHelper, Variable):
 
     def check(self, value):
         """Check set location source"""
+        if self.Get('cl_autopartition_set') == "on":
+            return
         ################################
         # check size for root device
         ################################
@@ -1947,6 +1949,8 @@ class VariableOsInstallMbr(LocationHelper, Variable):
         return filter(lambda x: x != "off", value)
 
     def check(self, value):
+        if self.Get('cl_autopartition_set') == "on":
+            return
         rootType = self.Get('os_install_root_type')
         if rootType == "flash":
             if len(value) > 1: