Исправлено обновление утилит со старых версий

master3.3
Mike Khiretskiy 10 years ago
parent a88a0f7111
commit 784581924b

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

Loading…
Cancel
Save