Исправление ошибки #611
parent
8261261eba
commit
fd381b8869
@ -1,9 +1,11 @@
|
||||
AUX calculate-core-3.1.6-r1.patch 2047 SHA256 b53e520611361cd4d576a7ed091e44e2050e07d4b08d485b5adab13d5f333526 SHA512 adb7897799029ca90c91e8558c8b39168fee5186050fec0e947899607605b0e83def582102dab5824b34ec79999e7cd3d70d61349c8ce1ca46f435da4ef46357 WHIRLPOOL 06075b8d0d8f9aff5975e446cc47873c2c9fc57693eed0ee19d9d0458f5409ce3310a6eb5d220f442813bf45df6c9d4578e5ae642942be22dc5a0169011e9e5e
|
||||
AUX calculate-core-3.1.8-r1.patch 515 SHA256 feb789b0a33181dd8e97cba7946f851404841f1825edaf51eb711da8eb1c2347 SHA512 d209364b3a7f2b01ee7474535d80db0f9dcbae10b249356e7b28c30967a22fa5dfb55047b377137f536cc169fa201210848acbba540e4d3585980a915d78cbb7 WHIRLPOOL 2049d9963df7e159e4b801642a481a58f09ced9e13e1843798098f7e7afabbc53a139502f2317cad1595c9b50ce233a3c75258f2d68f823ef515f4a993370673
|
||||
AUX calculate-core-3.1.8-r2.patch 1287 SHA256 02aedb82b237d82142c18c33ebeba2a957a36c330f12e85eb62b66766edcab06 SHA512 611c8433bd980cb6d028f8c60d19b356457cfde59fcdf4a20807d7b3349c59f64d08e79985217512f979d853f216d8e7489c447633ad26a83475e575cecc9d5b WHIRLPOOL b2bdec71eba66bb358c77d21cda7a0baae42105d2aebbc884ab1aa5cf7f8f6d918bbe9df133acbc254e07e3f81ff03bab68b827f24263b2da64fd3b315b7075d
|
||||
DIST calculate-core-3.1.6.tar.bz2 85099 SHA256 d582745a4b211202587cc8eda828bac8d69d5cf533e71ff51e0f3b27b15571a5 SHA512 63f9503be189af52cdcf917ab95841fa7030d181e25ff3910dba68ee0289590867ce1fe865a7c4dba778809ee43311067d4671330e8c5788397c83e162cd54e4 WHIRLPOOL ca9556855388168eb1b2b6cd4e4c7c8c879ac21cd79bede8ca6b2d765e57a52841ad1ac165bdbb9b99a8130942fa2b712bf7f09bb25e9941993225061bce97ab
|
||||
DIST calculate-core-3.1.8.tar.bz2 83713 SHA256 a9a4e5bfe30ca215b6c5cda5553153de144677bc639057df89f3355168470c68 SHA512 7f5c45c286a45b256e6c89aada1a786be5515209dca1c80fb0d37318120c383409133499cdcf6b9efd37ad32793a199769c580aca2bf77df72e8079d1fda7619 WHIRLPOOL 734fd80772f5c778cdaf6223ab9a650ccf86ffd61a8f5df4cf08f4d9bc5b8420500b68fad53aac48ec42d302e23664445e0b28cb3b5fe72272c88b1ed970ce2c
|
||||
EBUILD calculate-core-3.1.6-r1.ebuild 1256 SHA256 9ce24b8d3cf2c828e9808d19fa936057936c4e81529427dfc09c57d0248c813d SHA512 941eef21e80a832291e5a56b164d28c0c22c2d6cf338938b36ed8855d73d175011974065f2b6196d1050e453bf5887d44a8333ff182db1350a221969cd893146 WHIRLPOOL f13a896918fd732826cc6af5c0c66a504c568f60bafddb622f792dfa6054e0e2b92a2cce7aa677b22b02519508e370b5b2752c2774cc8a34352ea1bc41ac2c12
|
||||
EBUILD calculate-core-3.1.8-r1.ebuild 1257 SHA256 183b36d90d0d54178c644db5b4c89a3419b092b3d47413bbe8e89a2b76a41cd9 SHA512 f66d24d41edb65cac3037fb74fd1b19d37140bfff23cfe46b559b09962107a756ffd7d3e39ffe4b9051580669861c55cb87b6104ec3836a9255122a5c91a917f WHIRLPOOL aee71842359daa3313f2eaf1fc15389a3fd3921571ec149ebc5f9c3da6868260cb4876eecff8217979ab7e041b7ab90ee3b266b9aa5583fb6325eaa78f79f0c7
|
||||
EBUILD calculate-core-3.1.8-r2.ebuild 1257 SHA256 9e4bd6789ff2215445793a658765db10f6ee9623ac5a5451246bf41fe0734614 SHA512 e2221d7bfe05451fd1939fcb1ec1926b285a90c8872e2c24f79aed69b3676b7accaa213b9a4a143a8fba2f7b5c1b10ba28f2abb220bd230c4ff9991754fcfd90 WHIRLPOOL 10be5b83a53cf7164b6a7adb24e3f7ad057c5f7e8bf97e26342959b34992d62621d2bbef4cb66e33c13cfc862eae9bd0a18e733939636171f02fb67af53c226b
|
||||
EBUILD calculate-core-3.1.9999.ebuild 656 SHA256 475e34d10141354a4c60e029fc1cb74b080c3a1371d9e1e44a5e2936b7130ed4 SHA512 9ba865c5effa56079a3841a96d1a4a89d4bbc27e092042aa4a87d1b4ecde9d3a690c92c73e10b330724258aaf3138d2a58d50d18d2fbea9e657c3c5d2f8395ee WHIRLPOOL 89d3bcc657324d1ffb4265eab3e28e94e3d00fb7530c6654e75b52fe002d70f72998930729cfe3320a3ff571277e6e59c649b0df2fe071bcd9b050f9d42608eb
|
||||
MISC ChangeLog 382 SHA256 ce74a6d08ec1ea80ee021f5378f705102435abfcd5304d851c3f7932a967065e SHA512 f5531edead30072e8fb8f278cad1d265762b8ecdf146b86cf514704f373f2bd8068b3ed35e68186687f83129814b73c6269024d442fb592515c72a9d0e6d3ca1 WHIRLPOOL 48571b2986c2f8797109a3a3440a43f4f87b601e8e52bd41a470bd077b37eb2b6118e6baf86179df065aa2e4a840d9501b2b2455b990a19dfaa2d4ee7784c922
|
||||
MISC metadata.xml 285 SHA256 821f48d3fa5fac7f73ca371b49cfc11485a7ef44cc856817e41cb1665d89b0c5 SHA512 337b11b6e13958ce6550ab955e1fbc0061b919db3c9cac6964d323c4ab1ce3782e9dd473a1924bcf03b5058452aae212feeeb01e5e6c7844bb88675380c87162 WHIRLPOOL b117f08043f61eb0e88d3881d54ce29e4dd565129442554ee7a30f498b7140d6008abf57be22342a6df8eaefbdc351356dd813788ae25b6274ce6f6fdef30d0f
|
||||
|
||||
@ -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.8
|
||||
>=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.8-r2.patch"
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
diff --git core/server/func.py core/server/func.py
|
||||
index f4c1321..c095483 100644
|
||||
--- core/server/func.py
|
||||
+++ core/server/func.py
|
||||
@@ -26,6 +26,7 @@ setLocalTranslate('cl_core3',sys.modules[__name__])
|
||||
__ = getLazyLocalTranslate(_)
|
||||
|
||||
from calculate.lib.utils.files import process,readFile,processProgress
|
||||
+from calculate.lib.cl_template import TemplatesError
|
||||
from calculate.lib.utils.content import getCfgFiles
|
||||
from itertools import *
|
||||
|
||||
@@ -148,7 +149,7 @@ class CommonMethods:
|
||||
try:
|
||||
dirsFiles = clTempl.applyTemplates()
|
||||
if clTempl.getError():
|
||||
- raise InstallError(clTempl.getError())
|
||||
+ raise TemplatesError(clTempl.getError())
|
||||
finally:
|
||||
if clTempl:
|
||||
if clTempl.cltObj:
|
||||
diff --git core/utils/cl_core_custom.py core/utils/cl_core_custom.py
|
||||
index f9eb76d..4133f57 100644
|
||||
--- core/utils/cl_core_custom.py
|
||||
+++ core/utils/cl_core_custom.py
|
||||
@@ -21,7 +21,7 @@ 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__])
|
||||
+setLocalTranslate('cl_core3',sys.modules[__name__])
|
||||
__ = getLazyLocalTranslate(_)
|
||||
|
||||
class ClCoreCustomAction(Action):
|
||||
@ -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.8-r4
|
||||
=sys-apps/calculate-i18n-3.1.8
|
||||
=sys-apps/calculate-lib-3.1.8-r1
|
||||
=sys-apps/calculate-core-3.1.8-r2
|
||||
=sys-apps/calculate-update-3.1.8
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.8 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.8 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.8 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.8 )
|
||||
"
|
||||
Loading…
Reference in new issue