parent
bb4a96bd2d
commit
96ae5edf3b
@ -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.2.0_beta1
|
||||
>=dev-python/soaplib-1.0
|
||||
!minimal? ( dev-python/sudsds
|
||||
net-libs/dslib
|
||||
dev-python/pyopenssl
|
||||
dev-libs/openssl
|
||||
=dev-python/m2crypto-0.21.1-r1
|
||||
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.2.0_beta1-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,66 @@
|
||||
diff --git core/server/api_types.py core/server/api_types.py
|
||||
index 2a0c7d7..0d8d8b1 100644
|
||||
--- core/server/api_types.py
|
||||
+++ core/server/api_types.py
|
||||
@@ -295,7 +295,7 @@ class GroupField(DataVarsSerializer):
|
||||
onlyhelp=onlyhelp))
|
||||
else:
|
||||
uniqBrief = []
|
||||
- for varname in list(set(info['normal'])-set(uniqBrief)):
|
||||
+ for varname in (x for x in info['normal'] if x not in uniqBrief):
|
||||
inbrief = brief and varname in info['brief_force']
|
||||
if brief and 'hide' in info and varname in info['hide']:
|
||||
continue
|
||||
@@ -306,7 +306,7 @@ class GroupField(DataVarsSerializer):
|
||||
groupVars=groupDepVars,
|
||||
onlyhelp=onlyhelp))
|
||||
if info['expert']:
|
||||
- for varname in list(set(info['expert'])-set(uniqBrief)):
|
||||
+ for varname in (x for x in info['expert'] if x not in uniqBrief):
|
||||
if expert == True or \
|
||||
expert == None and dv.getInfo(varname).wasSet:
|
||||
self.fields.append(Field(name = "expert",
|
||||
diff --git core/server/func.py core/server/func.py
|
||||
index 1e1a6e2..5a6b964 100644
|
||||
--- core/server/func.py
|
||||
+++ core/server/func.py
|
||||
@@ -28,7 +28,8 @@ from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate
|
||||
setLocalTranslate('cl_core3',sys.modules[__name__])
|
||||
__ = getLazyLocalTranslate(_)
|
||||
|
||||
-from calculate.lib.utils.files import process,readFile,processProgress
|
||||
+from calculate.lib.utils.files import (process,readFile,processProgress,
|
||||
+ makeDirectory)
|
||||
from calculate.lib.datavars import DataVarsError, CriticalError
|
||||
from calculate.lib.cl_template import TemplatesError
|
||||
from calculate.lib.utils.content import getCfgFiles
|
||||
@@ -1103,7 +1104,7 @@ class CoreWsdl():
|
||||
""" write data in file """
|
||||
from baseClass import Basic
|
||||
if not os.path.exists(Basic.pids):
|
||||
- os.mkdir(Basic.pids)
|
||||
+ makeDirectory(Basic.pids)
|
||||
pid_file = path.join(Basic.pids, '%d.pid' % self.pid)
|
||||
try:
|
||||
with open(pid_file, 'w') as f:
|
||||
diff --git core/server/local_call.py core/server/local_call.py
|
||||
index 10b9c9c..efc4a0e 100644
|
||||
--- core/server/local_call.py
|
||||
+++ core/server/local_call.py
|
||||
@@ -31,6 +31,7 @@ from calculate.lib.datavars import VariableError, CriticalError
|
||||
from calculate.lib.cl_lang import setLocalTranslate
|
||||
from calculate.core.server.api_types import FieldAdapter
|
||||
from calculate.lib.utils.tools import ignore
|
||||
+from calculate.lib.utils.files import makeDirectory
|
||||
from calculate.core.result_viewer import ResultViewer
|
||||
from calculate.core.server.loaded_methods import LoadedMethods
|
||||
from calculate.core.result_viewer_gui import ProgressGui, ErrorGui, WarningGui
|
||||
@@ -121,7 +122,7 @@ class LocalCall(object):
|
||||
if self.clVars.Get('cl_ebuild_phase'):
|
||||
return
|
||||
if not os.path.exists(pids):
|
||||
- os.mkdir(pids)
|
||||
+ makeDirectory(pids)
|
||||
pid_file = path.join(pids, '%d.pid' % pid)
|
||||
try:
|
||||
with open(pid_file, 'w') as f:
|
||||
@ -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.2.0_beta1-r5
|
||||
=sys-apps/calculate-i18n-3.2.0_beta1
|
||||
=sys-apps/calculate-lib-3.2.0_beta1-r2
|
||||
=sys-apps/calculate-core-3.2.0_beta1-r2
|
||||
=sys-apps/calculate-update-3.2.0_beta1-r2
|
||||
cl_client? ( =sys-apps/calculate-client-3.2.0_beta1 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_beta1 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_beta1-r1 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.2.0_beta1 )
|
||||
"
|
||||
Loading…
Reference in new issue