From 784581924b36e9979a3178d068846def54975665 Mon Sep 17 00:00:00 2001
From: Mike Khiretskiy <mh@calculate.ru>
Date: Mon, 27 Oct 2014 11:21:33 +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=D0=BE=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=83=D1=82=D0=B8=D0=BB=D0=B8=D1=82=20?=
 =?UTF-8?q?=D1=81=D0=BE=20=D1=81=D1=82=D0=B0=D1=80=D1=8B=D1=85=20=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pym/install/variables/system.py | 56 +++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/pym/install/variables/system.py b/pym/install/variables/system.py
index 60e868e..d4ddff2 100644
--- a/pym/install/variables/system.py
+++ b/pym/install/variables/system.py
@@ -34,7 +34,6 @@ from calculate.lib.encrypt import encrypt
 import calculate.lib.cl_template as cl_template
 
 from calculate.lib.cl_lang import setLocalTranslate
-from calculate.update.variables import update
 
 setLocalTranslate('cl_install3',sys.modules[__name__])
 
@@ -728,30 +727,39 @@ class VariableOsInstallX11ServerSet(PackageCheckHelper):
     package = "x11-base/xorg-server"
 
 
-class VariableClInstallAutocheckSet(update.VariableClUpdateAutocheckSet):
+try:
+    from calculate.update.variables.update import (
+        VariableClUpdateAutocheckSet,
+        VariableClUpdateAutocheckInterval)
+    class VariableClInstallAutocheckSet(VariableClUpdateAutocheckSet):
 
-    def get(self):
-        return self.Get('update.cl_update_autocheck_set')
+        def get(self):
+            return self.Get('update.cl_update_autocheck_set')
 
-    def uncompatible(self):
-        """
-        Update setting up unavailable for flash installation
-        """
-        if self.Get('os_install_root_type') == 'flash':
-            return \
-                _("Update configuration unavailable for Flash install")
-        return ""
+        def uncompatible(self):
+            """
+            Update setting up unavailable for flash installation
+            """
+            if self.Get('os_install_root_type') == 'flash':
+                return \
+                    _("Update configuration unavailable for Flash install")
+            return ""
 
-class VariableClInstallAutocheckInterval(
-    update.VariableClUpdateAutocheckInterval):
-    def get(self):
-        return self.Get('update.cl_update_autocheck_interval')
+    class VariableClInstallAutocheckInterval(VariableClUpdateAutocheckInterval):
+        def get(self):
+            return self.Get('update.cl_update_autocheck_interval')
 
-    def uncompatible(self):
-        """
-        Update setting up unavailable for flash installation
-        """
-        if self.Get('os_install_root_type') == 'flash':
-            return \
-                _("Update configuration unavailable for Flash install")
-        return ""
+        def uncompatible(self):
+            """
+            Update setting up unavailable for flash installation
+            """
+            if self.Get('os_install_root_type') == 'flash':
+                return \
+                    _("Update configuration unavailable for Flash install")
+            return ""
+except ImportError:
+    class VariableClInstallAutocheckSet(Variable):
+        value = ""
+
+    class VariableClInstallAutocheckInterval(Variable):
+        value = ""