parent
ede3225e86
commit
36a74b79af
@ -0,0 +1,51 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The WSDL core for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-lib-3.1.7
|
||||
>=dev-python/soaplib-1.0
|
||||
!minimal? ( dev-python/sudsds
|
||||
net-libs/dslib
|
||||
dev-python/pyopenssl
|
||||
dev-libs/openssl
|
||||
dev-python/m2crypto
|
||||
dev-python/cherrypy )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_preinst() {
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-core-setup
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-core-patch
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For autoconfigure calculate-core for adminuser perform:"
|
||||
einfo " cl-core --bootstrap <username>"
|
||||
einfo "For run calculate-core perform:"
|
||||
einfo " /etc/init.d/calculate-core start"
|
||||
einfo "Add calcualte core to autorun:"
|
||||
einfo " rc-update add calculate-core boot"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-core-3.1.7-r7.patch"
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The WSDL core for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
|
||||
DEPEND="~sys-apps/calculate-lib-3.1.7
|
||||
>=dev-python/soaplib-1.0
|
||||
!minimal? ( dev-python/sudsds
|
||||
net-libs/dslib
|
||||
dev-python/pyopenssl
|
||||
dev-libs/openssl
|
||||
dev-python/m2crypto
|
||||
dev-python/cherrypy )"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_preinst() {
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-core-setup
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-core-patch
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
einfo "For autoconfigure calculate-core for adminuser perform:"
|
||||
einfo " cl-core --bootstrap <username>"
|
||||
einfo "For run calculate-core perform:"
|
||||
einfo " /etc/init.d/calculate-core start"
|
||||
einfo "Add calcualte core to autorun:"
|
||||
einfo " rc-update add calculate-core boot"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-core-3.1.7-r8.patch"
|
||||
}
|
||||
@ -0,0 +1,365 @@
|
||||
diff --git core/server/api_types.py core/server/api_types.py
|
||||
index 8161a9e..0bca760 100644
|
||||
--- core/server/api_types.py
|
||||
+++ core/server/api_types.py
|
||||
@@ -359,7 +359,7 @@ class ViewInfo(DataVarsSerializer):
|
||||
varGroups = datavars.getGroups()
|
||||
lastGroup = len(varGroups)-1
|
||||
# interate all vars group
|
||||
- if not onlyhelp and (step in(0,-1,None) or allsteps):
|
||||
+ if step in(0,-1,None) or allsteps:
|
||||
briefData = datavars.getBrief()
|
||||
self.groups.append(self.stepGroup(varGroups,brief_label,
|
||||
help_value=briefData.get("help",None),
|
||||
diff --git core/server/func.py core/server/func.py
|
||||
index fdee9d5..be7c323 100644
|
||||
--- core/server/func.py
|
||||
+++ core/server/func.py
|
||||
@@ -1659,7 +1659,7 @@ class WsdlBase:
|
||||
def clearDataVars(func):
|
||||
def wrapper(*args,**kwargs):
|
||||
try:
|
||||
- func(*args,**kwargs)
|
||||
+ return func(*args,**kwargs)
|
||||
finally:
|
||||
WsdlMeta.closeDataVars()
|
||||
return wrapper
|
||||
diff --git core/server/methods_func.py core/server/methods_func.py
|
||||
index d546c1f..72014a2 100644
|
||||
--- core/server/methods_func.py
|
||||
+++ core/server/methods_func.py
|
||||
@@ -501,10 +501,10 @@ def collect_object(client, param_object, view, args,wait_thread = None,
|
||||
val)
|
||||
|
||||
elif field.element in ['input', 'openfile',\
|
||||
- 'file', 'radio']:
|
||||
+ 'file', 'radio','combo','comboEdit']:
|
||||
param_object = set_obj_item(client, param_object, field.name,
|
||||
_getattr(args, field.name))
|
||||
- elif field.element in ['password'] and _getattr(args, field.name) \
|
||||
+ elif 'passwd' in field.element and _getattr(args, field.name) \
|
||||
or field.type and "need" in field.type:
|
||||
if wait_thread:
|
||||
wait_thread.pause()
|
||||
@@ -517,21 +517,6 @@ def collect_object(client, param_object, view, args,wait_thread = None,
|
||||
password)
|
||||
if wait_thread:
|
||||
wait_thread.resume()
|
||||
- elif field.element in ['combo', 'comboEdit']:
|
||||
- value = _getattr(args, field.name)
|
||||
- if value:
|
||||
- if hasattr (field.choice, 'string'):
|
||||
- choice = field.choice.string
|
||||
- else:
|
||||
- choice = field.choice
|
||||
- for item in choice:
|
||||
- if item:
|
||||
- if value.lower() == item.lower():
|
||||
- value = item
|
||||
- break
|
||||
-
|
||||
- param_object = set_obj_item(client, param_object, field.name,
|
||||
- value)
|
||||
elif field.element in ['multichoice', 'multichoice_add', \
|
||||
'selecttable', 'selecttable_add']:
|
||||
val = _getattr(args, field.name)
|
||||
diff --git core/server/replace_class.py core/server/replace_class.py
|
||||
index 860ede2..02ea194 100644
|
||||
--- core/server/replace_class.py
|
||||
+++ core/server/replace_class.py
|
||||
@@ -515,7 +515,7 @@ def call_method(metaObject, args, unknown_args, colorPrint):
|
||||
view_obj.step = None
|
||||
view_obj.expert = True
|
||||
view_obj.brief = None
|
||||
- view_obj.onlyhelp = False
|
||||
+ view_obj.onlyhelp = True
|
||||
|
||||
try:
|
||||
view = getattr(metaObject, method_view_name)(0, view_obj)
|
||||
diff --git core/utils/cl_core_custom.py core/utils/cl_core_custom.py
|
||||
new file mode 100644
|
||||
index 0000000..518f4cd
|
||||
--- /dev/null
|
||||
+++ core/utils/cl_core_custom.py
|
||||
@@ -0,0 +1,56 @@
|
||||
+#-*- coding: utf-8 -*-
|
||||
+
|
||||
+# Copyright 2013 Calculate Ltd. http://www.calculate-linux.org
|
||||
+#
|
||||
+# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
+# you may not use this file except in compliance with the License.
|
||||
+# You may obtain a copy of the License at
|
||||
+#
|
||||
+# http://www.apache.org/licenses/LICENSE-2.0
|
||||
+#
|
||||
+# Unless required by applicable law or agreed to in writing, software
|
||||
+# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
+# See the License for the specific language governing permissions and
|
||||
+# limitations under the License.
|
||||
+
|
||||
+import sys
|
||||
+from calculate.core.server.func import Action,Tasks
|
||||
+from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate
|
||||
+from calculate.lib.datavars import VariableError
|
||||
+from calculate.lib.cl_template import TemplatesError
|
||||
+from calculate.lib.utils.files import FilesError
|
||||
+
|
||||
+setLocalTranslate('cl_install3',sys.modules[__name__])
|
||||
+__ = getLazyLocalTranslate(_)
|
||||
+
|
||||
+class ClCoreCustomAction(Action):
|
||||
+ """
|
||||
+ Действие для настройки параметров видео
|
||||
+ """
|
||||
+ # ошибки, которые отображаются без подробностей
|
||||
+ native_error = (FilesError, TemplatesError,VariableError)
|
||||
+
|
||||
+ successMessage = __("Custom action successfully completed!")
|
||||
+ failedMessage = __("Failed to perform custom action!")
|
||||
+ interruptMessage = __("Custom action manually interrupted")
|
||||
+
|
||||
+ def __init__(self):
|
||||
+ # список задач для дейсвия
|
||||
+ self.tasks = [
|
||||
+ {'name':'apply_templates',
|
||||
+ # наложить шаблоны на текущий дистрибутив, включая clt шаблоны
|
||||
+ # без использования фильтров по clt шаблонам
|
||||
+ 'method':'UpdateConfigs.applyTemplates(None,False,'\
|
||||
+ 'None,None)',
|
||||
+ },
|
||||
+ {'name':'failed_action',
|
||||
+ 'error':__("Action {ac_custom_name} not found"),
|
||||
+ 'condition':lambda Get:not filter(
|
||||
+ lambda x:x and x[0] == 'ac_custom_name' and \
|
||||
+ x[1] == Get('ac_custom_name'),
|
||||
+ Get('cl_used_action'))
|
||||
+ }
|
||||
+ ]
|
||||
+
|
||||
+ Action.__init__(self)
|
||||
diff --git core/utils/cl_core_setup.py core/utils/cl_core_setup.py
|
||||
index 7d84869..900a213 100644
|
||||
--- core/utils/cl_core_setup.py
|
||||
+++ core/utils/cl_core_setup.py
|
||||
@@ -31,7 +31,7 @@ class ClCoreSetupAction(Action):
|
||||
# ошибки, которые отображаются без подробностей
|
||||
native_error = (FilesError,TemplatesError,VariableError,DataVarsError)
|
||||
templateTaskMessage = __("System are being configured")
|
||||
- successMessage = __("System configured!")
|
||||
+ successMessage = None
|
||||
failedMessage = __("Failed to configure the system!")
|
||||
interruptMessage = __("Configuration manually interrupted")
|
||||
|
||||
@@ -66,6 +66,7 @@ class ClCoreSetupAction(Action):
|
||||
'cl_template_path_use,cl_ebuild_phase,'
|
||||
'cl_template_clt_set)',
|
||||
'condition':lambda dv:(dv.Get('cl_core_pkg_desktop_set') == 'on' and
|
||||
+ dv.isModuleInstalled('desktop') and
|
||||
not dv.Get('cl_ebuild_phase') in ("preinst","prerm"))
|
||||
}
|
||||
]
|
||||
diff --git core/utils/cl_core_variables.py core/utils/cl_core_variables.py
|
||||
index 38c3dfd..d0c5ef3 100644
|
||||
--- core/utils/cl_core_variables.py
|
||||
+++ core/utils/cl_core_variables.py
|
||||
@@ -31,7 +31,7 @@ class ClCoreVariables(Action):
|
||||
native_error = (FilesError,DataVarsError,VariableError)
|
||||
successMessage = None
|
||||
failedMessage = None
|
||||
- interruptMessage = __("Setting manually interrupted")
|
||||
+ interruptMessage = __("Variables modification manually interrupted")
|
||||
|
||||
tasks = [
|
||||
{'name':'write_vars',
|
||||
diff --git core/variables/__init__.py core/variables/__init__.py
|
||||
index 7d3c43d..8e3dee1 100644
|
||||
--- core/variables/__init__.py
|
||||
+++ core/variables/__init__.py
|
||||
@@ -20,5 +20,6 @@ import certificate
|
||||
import groups
|
||||
import setup_package
|
||||
import variable
|
||||
+import action
|
||||
|
||||
section = "core"
|
||||
diff --git core/variables/action.py core/variables/action.py
|
||||
new file mode 100644
|
||||
index 0000000..25e3a2f
|
||||
--- /dev/null
|
||||
+++ core/variables/action.py
|
||||
@@ -0,0 +1,59 @@
|
||||
+#-*- coding: utf-8 -*-
|
||||
+
|
||||
+# Copyright 2013 Calculate Ltd. http://www.calculate-linux.org
|
||||
+#
|
||||
+# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
+# you may not use this file except in compliance with the License.
|
||||
+# You may obtain a copy of the License at
|
||||
+#
|
||||
+# http://www.apache.org/licenses/LICENSE-2.0
|
||||
+#
|
||||
+# Unless required by applicable law or agreed to in writing, software
|
||||
+# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
+# See the License for the specific language governing permissions and
|
||||
+# limitations under the License.
|
||||
+
|
||||
+import os
|
||||
+import sys
|
||||
+from os import path
|
||||
+from calculate.lib.datavars import (Variable,VariableError,ReadonlyVariable,
|
||||
+ ActionVariable)
|
||||
+
|
||||
+from calculate.lib.cl_lang import setLocalTranslate
|
||||
+from calculate.lib.cl_template import Template
|
||||
+setLocalTranslate('cl_core3',sys.modules[__name__])
|
||||
+
|
||||
+class VariableAcCustomName(Variable):
|
||||
+ """
|
||||
+ Пользовательское действие для выполнения шаблонов
|
||||
+ """
|
||||
+ opt = ["ac_custom_name"]
|
||||
+ metavalue = "ACTION"
|
||||
+ type = "choice"
|
||||
+ value = ""
|
||||
+ untrusted = True
|
||||
+
|
||||
+ def init(self):
|
||||
+ self.label = _("Custom action")
|
||||
+ self.help = _("custom action")
|
||||
+
|
||||
+ def choice(self):
|
||||
+ oldAction = self.Get('cl_action')
|
||||
+ oldName = self.Get('ac_custom_name')
|
||||
+ clTempl = Template(self.parent, cltObj = False)
|
||||
+ try:
|
||||
+ clTempl.applyTemplates()
|
||||
+ except:
|
||||
+ pass
|
||||
+ finally:
|
||||
+ self.parent.Set('cl_action',oldAction,force=True)
|
||||
+ self.parent.Set('ac_custom_name',oldName,force=True)
|
||||
+ clTempl.close()
|
||||
+ return list(set(map(lambda x:x[1],
|
||||
+ filter(lambda x:x[0] == 'ac_custom_name',
|
||||
+ self.Get('cl_used_action')))))
|
||||
+
|
||||
+ def check(self,value):
|
||||
+ if value == '':
|
||||
+ raise VariableError(_("Need to specify action name"))
|
||||
diff --git core/variables/certificate.py core/variables/certificate.py
|
||||
index a9efbb5..4511ff6 100644
|
||||
--- core/variables/certificate.py
|
||||
+++ core/variables/certificate.py
|
||||
@@ -165,7 +165,7 @@ class VariableClCertPerms(Variable):
|
||||
return results
|
||||
|
||||
def uncompatible(self):
|
||||
- return _('You can not change the certificate certificate')
|
||||
+ return _('You can not change the certificate permissions')
|
||||
|
||||
class VariableClCertGroups(Variable):
|
||||
"""
|
||||
diff --git core/variables/setup_package.py core/variables/setup_package.py
|
||||
index e2290ff..5f45dbd 100644
|
||||
--- core/variables/setup_package.py
|
||||
+++ core/variables/setup_package.py
|
||||
@@ -19,6 +19,7 @@ from os import path
|
||||
|
||||
from calculate.lib.cl_lang import setLocalTranslate
|
||||
from calculate.core.server.decorators import Dec
|
||||
+import pwd
|
||||
#from calculate.api.cert_cmd import find_id_cert
|
||||
setLocalTranslate('cl_core3',sys.modules[__name__])
|
||||
|
||||
@@ -26,6 +27,7 @@ from calculate.lib.utils.files import listDirectory
|
||||
from calculate.lib.utils.portage import isPkgInstalled,reVerSplitToPV, \
|
||||
getPkgSlot
|
||||
from calculate.lib.utils.common import getTupleVersion
|
||||
+from calculate.lib.variables.user import VariableUrLogin
|
||||
from itertools import *
|
||||
import glob
|
||||
|
||||
@@ -211,3 +213,20 @@ class VariableClCorePkgRootSet(Variable):
|
||||
def init(self):
|
||||
self.label = _("Configure dependent packages in root")
|
||||
self.help = _("configure the dependent packages in the same directory as the specified package, instead of root")
|
||||
+
|
||||
+class VariableUrCoreLogin(VariableUrLogin):
|
||||
+ """
|
||||
+ User Login
|
||||
+ """
|
||||
+ opt = ["--login"]
|
||||
+ alias = "ur_login"
|
||||
+
|
||||
+ def check(self,value):
|
||||
+ """Пользователь существует"""
|
||||
+ try:
|
||||
+ pwd.getpwnam(value).pw_gid
|
||||
+ except:
|
||||
+ raise VariableError(_("User %s does not exist")%value)
|
||||
+
|
||||
+ def get(self):
|
||||
+ return self.Get('ur_login')
|
||||
diff --git core/wsdl_core.py core/wsdl_core.py
|
||||
index 2b4cdbc..94e74ef 100644
|
||||
--- core/wsdl_core.py
|
||||
+++ core/wsdl_core.py
|
||||
@@ -23,6 +23,7 @@ setLocalTranslate('cl_core3',sys.modules[__name__])
|
||||
__ = getLazyLocalTranslate(_)
|
||||
|
||||
import setup_package
|
||||
+import custom_action
|
||||
import server.certificate as certificate
|
||||
import server.groups as groups
|
||||
import server.request as request
|
||||
@@ -38,6 +39,7 @@ from calculate.core.utils.cl_core_request import (ClCoreRequestShow,
|
||||
ClCoreRequestConfirm,ClCoreRequestDel)
|
||||
from calculate.core.utils.cl_core_variables import (ClCoreVariables,
|
||||
ClCoreVariablesShow)
|
||||
+from calculate.core.utils.cl_core_custom import ClCoreCustomAction
|
||||
|
||||
class Wsdl(WsdlBase):
|
||||
methods = [
|
||||
@@ -573,4 +575,40 @@ class Wsdl(WsdlBase):
|
||||
lambda group:group(_("Setup variables"),
|
||||
normal=('cl_variable_filter','cl_variable_show'),
|
||||
next_label=_("Show"))]},
|
||||
+ #
|
||||
+ # отобразить переменные
|
||||
+ #
|
||||
+ {
|
||||
+ # идентификатор метода
|
||||
+ 'method_name':"core_custom",
|
||||
+ # категория метода
|
||||
+ 'category':__('Utilities'),
|
||||
+ # заголовок метода
|
||||
+ 'title':__("Custom action"),
|
||||
+ # иконка для графической консоли
|
||||
+ 'image':'gnome-desktop-config,desktop-config',
|
||||
+ # метод в графической консоли
|
||||
+ 'gui':True,
|
||||
+ # консольная команда
|
||||
+ 'command':'cl-core-custom',
|
||||
+ # права для запуска метода
|
||||
+ 'rights':['configure'],
|
||||
+ # объект содержащий модули для действия
|
||||
+ 'logic':{'UpdateConfigs':setup_package.UpdateConfigs},
|
||||
+ # описание действия
|
||||
+ 'action':ClCoreCustomAction,
|
||||
+ # объект переменных
|
||||
+ 'datavars':"core",
|
||||
+ 'native_error':(VariableError,DataVarsError,
|
||||
+ custom_action.CustomActionError),
|
||||
+ # значения по умолчанию для переменных этого метода
|
||||
+ 'setvars':{'cl_verbose_set':"on",'cl_human_edit_set':"on"},
|
||||
+ # описание груп (список лямбда функций)
|
||||
+ 'groups':[
|
||||
+ lambda group:group(_("Custom action"),
|
||||
+ normal=('ac_custom_name','cl_human_edit_set','cl_verbose_set'),
|
||||
+ expert=('ur_core_login',
|
||||
+ 'cl_templates_locate',
|
||||
+ 'cl_dispatch_conf'),
|
||||
+ next_label=_("Perform"))]},
|
||||
]
|
||||
@ -0,0 +1,289 @@
|
||||
diff --git core/server/api_types.py core/server/api_types.py
|
||||
index 8161a9e..0bca760 100644
|
||||
--- core/server/api_types.py
|
||||
+++ core/server/api_types.py
|
||||
@@ -359,7 +359,7 @@ class ViewInfo(DataVarsSerializer):
|
||||
varGroups = datavars.getGroups()
|
||||
lastGroup = len(varGroups)-1
|
||||
# interate all vars group
|
||||
- if not onlyhelp and (step in(0,-1,None) or allsteps):
|
||||
+ if step in(0,-1,None) or allsteps:
|
||||
briefData = datavars.getBrief()
|
||||
self.groups.append(self.stepGroup(varGroups,brief_label,
|
||||
help_value=briefData.get("help",None),
|
||||
diff --git core/server/func.py core/server/func.py
|
||||
index fdee9d5..be7c323 100644
|
||||
--- core/server/func.py
|
||||
+++ core/server/func.py
|
||||
@@ -1659,7 +1659,7 @@ class WsdlBase:
|
||||
def clearDataVars(func):
|
||||
def wrapper(*args,**kwargs):
|
||||
try:
|
||||
- func(*args,**kwargs)
|
||||
+ return func(*args,**kwargs)
|
||||
finally:
|
||||
WsdlMeta.closeDataVars()
|
||||
return wrapper
|
||||
diff --git core/server/methods_func.py core/server/methods_func.py
|
||||
index d546c1f..72014a2 100644
|
||||
--- core/server/methods_func.py
|
||||
+++ core/server/methods_func.py
|
||||
@@ -501,10 +501,10 @@ def collect_object(client, param_object, view, args,wait_thread = None,
|
||||
val)
|
||||
|
||||
elif field.element in ['input', 'openfile',\
|
||||
- 'file', 'radio']:
|
||||
+ 'file', 'radio','combo','comboEdit']:
|
||||
param_object = set_obj_item(client, param_object, field.name,
|
||||
_getattr(args, field.name))
|
||||
- elif field.element in ['password'] and _getattr(args, field.name) \
|
||||
+ elif 'passwd' in field.element and _getattr(args, field.name) \
|
||||
or field.type and "need" in field.type:
|
||||
if wait_thread:
|
||||
wait_thread.pause()
|
||||
@@ -517,21 +517,6 @@ def collect_object(client, param_object, view, args,wait_thread = None,
|
||||
password)
|
||||
if wait_thread:
|
||||
wait_thread.resume()
|
||||
- elif field.element in ['combo', 'comboEdit']:
|
||||
- value = _getattr(args, field.name)
|
||||
- if value:
|
||||
- if hasattr (field.choice, 'string'):
|
||||
- choice = field.choice.string
|
||||
- else:
|
||||
- choice = field.choice
|
||||
- for item in choice:
|
||||
- if item:
|
||||
- if value.lower() == item.lower():
|
||||
- value = item
|
||||
- break
|
||||
-
|
||||
- param_object = set_obj_item(client, param_object, field.name,
|
||||
- value)
|
||||
elif field.element in ['multichoice', 'multichoice_add', \
|
||||
'selecttable', 'selecttable_add']:
|
||||
val = _getattr(args, field.name)
|
||||
diff --git core/server/replace_class.py core/server/replace_class.py
|
||||
index 860ede2..02ea194 100644
|
||||
--- core/server/replace_class.py
|
||||
+++ core/server/replace_class.py
|
||||
@@ -515,7 +515,7 @@ def call_method(metaObject, args, unknown_args, colorPrint):
|
||||
view_obj.step = None
|
||||
view_obj.expert = True
|
||||
view_obj.brief = None
|
||||
- view_obj.onlyhelp = False
|
||||
+ view_obj.onlyhelp = True
|
||||
|
||||
try:
|
||||
view = getattr(metaObject, method_view_name)(0, view_obj)
|
||||
diff --git core/utils/cl_core_custom.py core/utils/cl_core_custom.py
|
||||
new file mode 100644
|
||||
index 0000000..518f4cd
|
||||
--- /dev/null
|
||||
+++ core/utils/cl_core_custom.py
|
||||
@@ -0,0 +1,56 @@
|
||||
+#-*- coding: utf-8 -*-
|
||||
+
|
||||
+# Copyright 2013 Calculate Ltd. http://www.calculate-linux.org
|
||||
+#
|
||||
+# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
+# you may not use this file except in compliance with the License.
|
||||
+# You may obtain a copy of the License at
|
||||
+#
|
||||
+# http://www.apache.org/licenses/LICENSE-2.0
|
||||
+#
|
||||
+# Unless required by applicable law or agreed to in writing, software
|
||||
+# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
+# See the License for the specific language governing permissions and
|
||||
+# limitations under the License.
|
||||
+
|
||||
+import sys
|
||||
+from calculate.core.server.func import Action,Tasks
|
||||
+from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate
|
||||
+from calculate.lib.datavars import VariableError
|
||||
+from calculate.lib.cl_template import TemplatesError
|
||||
+from calculate.lib.utils.files import FilesError
|
||||
+
|
||||
+setLocalTranslate('cl_install3',sys.modules[__name__])
|
||||
+__ = getLazyLocalTranslate(_)
|
||||
+
|
||||
+class ClCoreCustomAction(Action):
|
||||
+ """
|
||||
+ Действие для настройки параметров видео
|
||||
+ """
|
||||
+ # ошибки, которые отображаются без подробностей
|
||||
+ native_error = (FilesError, TemplatesError,VariableError)
|
||||
+
|
||||
+ successMessage = __("Custom action successfully completed!")
|
||||
+ failedMessage = __("Failed to perform custom action!")
|
||||
+ interruptMessage = __("Custom action manually interrupted")
|
||||
+
|
||||
+ def __init__(self):
|
||||
+ # список задач для дейсвия
|
||||
+ self.tasks = [
|
||||
+ {'name':'apply_templates',
|
||||
+ # наложить шаблоны на текущий дистрибутив, включая clt шаблоны
|
||||
+ # без использования фильтров по clt шаблонам
|
||||
+ 'method':'UpdateConfigs.applyTemplates(None,False,'\
|
||||
+ 'None,None)',
|
||||
+ },
|
||||
+ {'name':'failed_action',
|
||||
+ 'error':__("Action {ac_custom_name} not found"),
|
||||
+ 'condition':lambda Get:not filter(
|
||||
+ lambda x:x and x[0] == 'ac_custom_name' and \
|
||||
+ x[1] == Get('ac_custom_name'),
|
||||
+ Get('cl_used_action'))
|
||||
+ }
|
||||
+ ]
|
||||
+
|
||||
+ Action.__init__(self)
|
||||
diff --git core/utils/cl_core_setup.py core/utils/cl_core_setup.py
|
||||
index 7d84869..900a213 100644
|
||||
--- core/utils/cl_core_setup.py
|
||||
+++ core/utils/cl_core_setup.py
|
||||
@@ -31,7 +31,7 @@ class ClCoreSetupAction(Action):
|
||||
# ошибки, которые отображаются без подробностей
|
||||
native_error = (FilesError,TemplatesError,VariableError,DataVarsError)
|
||||
templateTaskMessage = __("System are being configured")
|
||||
- successMessage = __("System configured!")
|
||||
+ successMessage = None
|
||||
failedMessage = __("Failed to configure the system!")
|
||||
interruptMessage = __("Configuration manually interrupted")
|
||||
|
||||
@@ -66,6 +66,7 @@ class ClCoreSetupAction(Action):
|
||||
'cl_template_path_use,cl_ebuild_phase,'
|
||||
'cl_template_clt_set)',
|
||||
'condition':lambda dv:(dv.Get('cl_core_pkg_desktop_set') == 'on' and
|
||||
+ dv.isModuleInstalled('desktop') and
|
||||
not dv.Get('cl_ebuild_phase') in ("preinst","prerm"))
|
||||
}
|
||||
]
|
||||
diff --git core/utils/cl_core_variables.py core/utils/cl_core_variables.py
|
||||
index 38c3dfd..d0c5ef3 100644
|
||||
--- core/utils/cl_core_variables.py
|
||||
+++ core/utils/cl_core_variables.py
|
||||
@@ -31,7 +31,7 @@ class ClCoreVariables(Action):
|
||||
native_error = (FilesError,DataVarsError,VariableError)
|
||||
successMessage = None
|
||||
failedMessage = None
|
||||
- interruptMessage = __("Setting manually interrupted")
|
||||
+ interruptMessage = __("Variables modification manually interrupted")
|
||||
|
||||
tasks = [
|
||||
{'name':'write_vars',
|
||||
diff --git core/variables/certificate.py core/variables/certificate.py
|
||||
index a9efbb5..4511ff6 100644
|
||||
--- core/variables/certificate.py
|
||||
+++ core/variables/certificate.py
|
||||
@@ -165,7 +165,7 @@ class VariableClCertPerms(Variable):
|
||||
return results
|
||||
|
||||
def uncompatible(self):
|
||||
- return _('You can not change the certificate certificate')
|
||||
+ return _('You can not change the certificate permissions')
|
||||
|
||||
class VariableClCertGroups(Variable):
|
||||
"""
|
||||
diff --git core/variables/setup_package.py core/variables/setup_package.py
|
||||
index e2290ff..5f45dbd 100644
|
||||
--- core/variables/setup_package.py
|
||||
+++ core/variables/setup_package.py
|
||||
@@ -19,6 +19,7 @@ from os import path
|
||||
|
||||
from calculate.lib.cl_lang import setLocalTranslate
|
||||
from calculate.core.server.decorators import Dec
|
||||
+import pwd
|
||||
#from calculate.api.cert_cmd import find_id_cert
|
||||
setLocalTranslate('cl_core3',sys.modules[__name__])
|
||||
|
||||
@@ -26,6 +27,7 @@ from calculate.lib.utils.files import listDirectory
|
||||
from calculate.lib.utils.portage import isPkgInstalled,reVerSplitToPV, \
|
||||
getPkgSlot
|
||||
from calculate.lib.utils.common import getTupleVersion
|
||||
+from calculate.lib.variables.user import VariableUrLogin
|
||||
from itertools import *
|
||||
import glob
|
||||
|
||||
@@ -211,3 +213,20 @@ class VariableClCorePkgRootSet(Variable):
|
||||
def init(self):
|
||||
self.label = _("Configure dependent packages in root")
|
||||
self.help = _("configure the dependent packages in the same directory as the specified package, instead of root")
|
||||
+
|
||||
+class VariableUrCoreLogin(VariableUrLogin):
|
||||
+ """
|
||||
+ User Login
|
||||
+ """
|
||||
+ opt = ["--login"]
|
||||
+ alias = "ur_login"
|
||||
+
|
||||
+ def check(self,value):
|
||||
+ """Пользователь существует"""
|
||||
+ try:
|
||||
+ pwd.getpwnam(value).pw_gid
|
||||
+ except:
|
||||
+ raise VariableError(_("User %s does not exist")%value)
|
||||
+
|
||||
+ def get(self):
|
||||
+ return self.Get('ur_login')
|
||||
diff --git core/wsdl_core.py core/wsdl_core.py
|
||||
index 2b4cdbc..94e74ef 100644
|
||||
--- core/wsdl_core.py
|
||||
+++ core/wsdl_core.py
|
||||
@@ -23,6 +23,7 @@ setLocalTranslate('cl_core3',sys.modules[__name__])
|
||||
__ = getLazyLocalTranslate(_)
|
||||
|
||||
import setup_package
|
||||
+import custom_action
|
||||
import server.certificate as certificate
|
||||
import server.groups as groups
|
||||
import server.request as request
|
||||
@@ -38,6 +39,7 @@ from calculate.core.utils.cl_core_request import (ClCoreRequestShow,
|
||||
ClCoreRequestConfirm,ClCoreRequestDel)
|
||||
from calculate.core.utils.cl_core_variables import (ClCoreVariables,
|
||||
ClCoreVariablesShow)
|
||||
+from calculate.core.utils.cl_core_custom import ClCoreCustomAction
|
||||
|
||||
class Wsdl(WsdlBase):
|
||||
methods = [
|
||||
@@ -573,4 +575,40 @@ class Wsdl(WsdlBase):
|
||||
lambda group:group(_("Setup variables"),
|
||||
normal=('cl_variable_filter','cl_variable_show'),
|
||||
next_label=_("Show"))]},
|
||||
+ #
|
||||
+ # отобразить переменные
|
||||
+ #
|
||||
+ {
|
||||
+ # идентификатор метода
|
||||
+ 'method_name':"core_custom",
|
||||
+ # категория метода
|
||||
+ 'category':__('Utilities'),
|
||||
+ # заголовок метода
|
||||
+ 'title':__("Custom action"),
|
||||
+ # иконка для графической консоли
|
||||
+ 'image':'gnome-desktop-config,desktop-config',
|
||||
+ # метод в графической консоли
|
||||
+ 'gui':True,
|
||||
+ # консольная команда
|
||||
+ 'command':'cl-core-custom',
|
||||
+ # права для запуска метода
|
||||
+ 'rights':['configure'],
|
||||
+ # объект содержащий модули для действия
|
||||
+ 'logic':{'UpdateConfigs':setup_package.UpdateConfigs},
|
||||
+ # описание действия
|
||||
+ 'action':ClCoreCustomAction,
|
||||
+ # объект переменных
|
||||
+ 'datavars':"core",
|
||||
+ 'native_error':(VariableError,DataVarsError,
|
||||
+ custom_action.CustomActionError),
|
||||
+ # значения по умолчанию для переменных этого метода
|
||||
+ 'setvars':{'cl_verbose_set':"on",'cl_human_edit_set':"on"},
|
||||
+ # описание груп (список лямбда функций)
|
||||
+ 'groups':[
|
||||
+ lambda group:group(_("Custom action"),
|
||||
+ normal=('ac_custom_name','cl_human_edit_set','cl_verbose_set'),
|
||||
+ expert=('ur_core_login',
|
||||
+ 'cl_templates_locate',
|
||||
+ 'cl_dispatch_conf'),
|
||||
+ next_label=_("Perform"))]},
|
||||
]
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The library for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
DEPEND="!minimal? ( dev-python/py-smbpasswd )
|
||||
>=dev-python/pyxml-0.8
|
||||
sys-apps/iproute2
|
||||
sys-apps/pciutils
|
||||
sys-fs/lvm2
|
||||
sys-fs/mdadm
|
||||
dev-python/pyinotify
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-lib-3.1.7-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The library for Calculate 3"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="minimal"
|
||||
DEPEND="!minimal? ( dev-python/py-smbpasswd )
|
||||
>=dev-python/pyxml-0.8
|
||||
sys-apps/iproute2
|
||||
sys-apps/pciutils
|
||||
sys-fs/lvm2
|
||||
sys-fs/mdadm
|
||||
dev-python/pyinotify
|
||||
sys-apps/file[python]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-lib-3.1.7-r3.patch"
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.1.7-r5
|
||||
=sys-apps/calculate-i18n-3.1.7
|
||||
=sys-apps/calculate-lib-3.1.7-r2
|
||||
=sys-apps/calculate-core-3.1.7-r7
|
||||
=sys-apps/calculate-update-3.1.7
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.7-r3 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.7-r1 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.7-r1 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.7 )
|
||||
"
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.1.7-r5
|
||||
=sys-apps/calculate-i18n-3.1.7
|
||||
=sys-apps/calculate-lib-3.1.7-r3
|
||||
=sys-apps/calculate-core-3.1.7-r8
|
||||
=sys-apps/calculate-update-3.1.7
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.7-r3 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.7-r1 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.7-r1 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.7 )
|
||||
"
|
||||
Loading…
Reference in new issue