calculate
/
distros-overlay
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Исправления для alpha7

Browse Source
mhiretskiy
Mike khiretskiy 10 years ago
parent 6fd90d5327
commit 9d3c69d6b0
5 changed files with 147 additions and 0 deletions
Show Stats Download Patch File Download Diff File

2
sys-apps/calculate-core/Manifest
Unescape View File

@ -1,9 +1,11 @@
AUX calculate-core-3.2.0_alpha6-r1.patch 28016 SHA256 d99381bd316fba8256b5eb54945124c5f32d816b06ad3d32c7d972ff0d01e71e SHA512 a60106837082dd4e4f2794f71cf69a782fcb22f823a1f9f325e14145cbb195fd79e2b0bf5cfb1de486c0bb76b7b00c4694c33c1a9a639a7022f4b34c4f08f3b5 WHIRLPOOL d96a915b3755b061667e1ce8234c480e677429b6bae118774027a4d58930a9b2c13af635638d0c3a972e6ff64a7a19cbadf6abe1d048eb9c55e0e41ecfa522e3
AUX calculate-core-3.2.0_alpha7-r1.patch 1253 SHA256 d1fa9b92b9616e22f7ff48de153a0b07e5c5f30727784048c341135e2b992869 SHA512 b0fd0053961d62a0eba396ca34d7bd41551b3430bae1a8467410758222c8367809e16edc2b1282fe2ef31f469a0cc3619ecbf0581952f9a1a8c5fed4102e9477 WHIRLPOOL 9e90ce6979ac1e8db54a12bd04eac784650a0feffaffdc51569a52a4a84fdfa7f0afc60c2f370e18798a7cadf0d638530f1dd1d014aa23af6810507706792b1e
AUX calculate-core-3.2.0_alpha7-r2.patch 2540 SHA256 89541f9da25b7b4fd71410c5369f8e53f5e589740a644150e78d685c7d867fb4 SHA512 d40195a176c24a891cb6fa84e215c45a6961853fcce775727c39c55a7abe851ba35e2582e11aeb43ee84f7565bc4006f9376136c9570f61710d0b3487ecdd630 WHIRLPOOL c6912581585122ef4759b51d19b20aeea8befa7b96d67431b6e7a88f33908f2eed4c14172bd41a62e6fc836447263d0203936f80728e268f208ab79dc20aa167
DIST calculate-core-3.2.0_alpha6.tar.bz2 85602 SHA256 cd2bfdd419972f6be8c31e8d7ec853df1286948bc70ee381b2d9a3ea77ee7afe SHA512 c9229a2f0bd623cc5d40cd255688ceaa88122ab2d3ae67288ca3e53da4e6a6027af31e54be2dbfc9b95d47fce66f21ced92becd93f72a3d619e9dbbcb903af80 WHIRLPOOL ea5c0ec38595c30751d10797af28b946e254063f8de247bd9f75ed5800e1ac96844cd8dac2e4ad534675dbbb32472753fadd3b21e1fa245c975f7c196c828118
DIST calculate-core-3.2.0_alpha7.tar.bz2 86089 SHA256 427ce83eccbf25a559bf8345bf21524e62045339afba8a43dc03b282b22bea23 SHA512 3d232eb6dc92ff13932363ecdcd5b6dd1ce812b978a4dff04f57ab9b38971d3a60976f356ad63dbf92f3b7342ed0b5f834d10a47a1b44281e4f617e3d5a919b6 WHIRLPOOL bf96851963ac3c9ae75dc3e1cf83e1cfba3a30c87b8a06b2e05eeac1ba45e3363709bfd8404719ba14d11312654c9b3a4d236a6009fd7fb7ecf7886e077f3bb6
EBUILD calculate-core-3.2.0_alpha6-r1.ebuild 1271 SHA256 eeb673d23352cb9df02b93f47eaf3c2e3558a89fa94867fb1f3d1f8b5bfcf096 SHA512 ae4b2dc1f27e84c18e35fc0674ff522398f4c90965f67e278c830da707d9d00cb885b5b11deaabde32f3646e8de9929d38605cf35f14a755b1e772e19fce8b21 WHIRLPOOL ec4d78b528eafc85f1bbdc139d0ac5847b1470ca74a2d1db62b5bf00d54af937ac6c8228256cb2643180f477670efdb230834d2294a097558bb1c84e42992cdb
EBUILD calculate-core-3.2.0_alpha6.ebuild 1129 SHA256 e97ed753f108f340b41475c02a65fd4a05576e6f112e677271df991a680143fd SHA512 ce1f5eb6fdade47f2dd8d2a2a306eaa8ad9b57e52ea88fe5cf5fcabd933fbdec2e7cc114a2ad8e242aacb2bf2b90f5e74c7f22dae743ff063f29c71dcc01714e WHIRLPOOL c47b85f17c567c550bfec337f5d241593fd789c441af1ecaf366f20c5c594f21367e381610a7ca1901e6fded6b1c159b16a8f5645b0d7af812679175b40b9ea8
EBUILD calculate-core-3.2.0_alpha7-r1.ebuild 1271 SHA256 5149839649559b1d9784deac00ca97fed9c6309000ee0fa435a2ce7ca429e91c SHA512 75eb1cfb4f5f51b122210456049138b784929447d9b838a70656c5a5f39c083bb9a2575a4ddc56329923fe622c270875573d7d1332646405230b88ea90aa11c0 WHIRLPOOL 33da4009b93d374ea8e3b537ccdd52aea686e080039b585cd51ee3002fc64585e672f0c6b77055d12447a6329b5c5da331f40dff82d31c004ca128c8145e73a0
EBUILD calculate-core-3.2.0_alpha7-r2.ebuild 1271 SHA256 ad9e06cdd19d72dda58c4ebedcf98782aea5a5861d9014feb8a24972437c37c3 SHA512 8cb8b65ad8ddcab8d2bb6387db1de72d9f74b468faf89eff6d1229e71a43da3d000dc2de52a5b8c4e4b6a5ca3784e5b774154c50ed941db8b43bcfe619cda048 WHIRLPOOL 3c948023080054221b9a4cb15db69156a18132c4b30666890ca97097c5cb8759608196a10655e7251240dd0e0815f375b619466aa241b8e2ef7c925a64a21d61
EBUILD calculate-core-3.2.0_alpha7.ebuild 1129 SHA256 8f4d227566860928a01ed9e8225ae9f5ea7acba537798e28b717cc1b9ac1f820 SHA512 5c4b49360781ba90c047aba5f171be9d456490ea51975a47ba5d31de781cc2fb0d4cb875fb553e64a6eb83cb3a3fc8887be2a85a0181e6179316f79c6ea09e29 WHIRLPOOL 628c2137a0e490d80a34787defa3e474fbb29b8f9f02383e82e60c86e0a119d48d854c8e04086f0f797ff57eab299b96002c932937f899142d4ae213c7d9547f
EBUILD calculate-core-3.2.9999.ebuild 656 SHA256 39383ebc527d7155b147355108ec0b069f7cad95d5fcabc33520f0fe1ee0b971 SHA512 e20a8dea6e20615baeb56069331cdc35a7c37a05afa125c7174c5082852242da446830940c962fd890bb6627d9f5cacf0848834b75bfb1a184a6acfef17f95f8 WHIRLPOOL 3e9f06bf7e2f99a46e3c681fa6f381b7b1883bb15e05c535a7acde55f9092418d0b71d95ce4b2906e8505ea73c4157620303e4e4e4e4de430f11bfd6214b4a88

51
sys-apps/calculate-core/calculate-core-3.2.0_alpha7-r2.ebuild
Unescape View File

@ -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_alpha7
>=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.2.0_alpha7-r2.patch"
}

67
sys-apps/calculate-core/files/calculate-core-3.2.0_alpha7-r2.patch
Unescape View File

@ -0,0 +1,67 @@
diff --git core/server/cl_server.py core/server/cl_server.py
index abd555f..549397c 100644
--- core/server/cl_server.py
+++ core/server/cl_server.py
@@ -248,7 +248,9 @@ def main(*args, **keywords):
sys.exit(1)
# For cleaning of sessions at server reboot
from clean import clean
+ from gen_pid import clear_finished_pids
clean(sids_file, pids_file, sids_pids, sids, pids)
+ clear_finished_pids(ob)
print _("Server started")
server.start()
except KeyboardInterrupt, e:
diff --git core/server/gen_pid.py core/server/gen_pid.py
index 1bd1a40..44034b7 100644
--- core/server/gen_pid.py
+++ core/server/gen_pid.py
@@ -30,6 +30,13 @@ class ProcessStatus:
def search_worked_process(method_name, clVars):
+ """
+ Найти все работающие процессы
+
+ Возвращает список процессов со статусом Worked и существующем системным
+ процессом
+ """
+
def generator():
pids = clVars.Get('core.cl_core_pids_path')
for pidfile in listDirectory(pids, fullPath=True):
@@ -37,15 +44,30 @@ def search_worked_process(method_name, clVars):
status = pickle.load(open(pidfile))
if (status['name'] == method_name and
status['status'] == ProcessStatus.Worked):
- pid = int(path.basename(pidfile)[:-4])
- if path.exists(path.join("/proc",str(status['os_pid']))):
+ if path.exists(path.join("/proc", str(status['os_pid']))):
yield status['os_pid']
- except (ValueError, EOFError, OSError):
+ except (ValueError, KeyError, EOFError, OSError):
pass
- #print "DEBUG",list(generator())
+
return list(generator())
+def clear_finished_pids(clVars):
+ """
+ Удалить все идентификационные файлы завершившихся процессов
+ """
+ pids = clVars.Get('core.cl_core_pids_path')
+ for pidfile in listDirectory(pids, fullPath=True):
+ try:
+ d = pickle.load(open(pidfile))
+ if path.exists(path.join("/proc", str(d['os_pid']))):
+ continue
+ except (ValueError, KeyError, EOFError, OSError):
+ pass
+ with ignore(OSError):
+ os.unlink(pidfile)
+
+
# process management
class CoreWsdl():
# delete process id from list process

1
sys-apps/calculate-utilities/Manifest
Unescape View File

@ -1,5 +1,6 @@
EBUILD calculate-utilities-3.2.0_alpha6-r1.ebuild 827 SHA256 943e1949dec30c2f0ffd5a7cd065c8101ee6e999acc09d2ebd256f67b44b13bb SHA512 a9fede957dd87532feac22f631935b2ee6933541e8b589abe892ec45960a09063b9b0009298fccb346ab74dbfd6d5889d13f9fbfe4a42b56ec086e7140d12bad WHIRLPOOL c75eea5fc5d82a42615346dbc72664dfec75dbf87ab61b2ff3cb2bbf15ae78634befa815aed95f09ae00e268b618e966815a87e309128777b3455ac08e793e0c
EBUILD calculate-utilities-3.2.0_alpha6.ebuild 812 SHA256 21f5c205fbb62622da8c262be1be8f3e5d7da7b64e3c93c7b33ca04693452490 SHA512 025b503372989e498fc6b50609d3ebbf13f3376b8e66c5123e3dcebeb0722ff586212c08cf085ee9bd02e215c7ac03d9876b00f73ff1f636a14a1f5d146c3869 WHIRLPOOL 259a86930a618b530515322cf73a4cb0ab8f16a44f8531ae478f30173e1f376272afbdd3b80c6e195e65cbdf10ec19544eae990e262726a51097f01650b5d1cb
EBUILD calculate-utilities-3.2.0_alpha7-r1.ebuild 821 SHA256 d3e0d296edbec1f2e4ccbaa06f96439dea69a0133906dbf1ca47ad511b8e278f SHA512 349e10ca39de59f840083c271146e0ff8999c1ac2d66ff775b8c33e6bb97d5455cdf0913e6a12dd4a1111320841360a507fbe8552ed64712db6f5b10cdebf6c8 WHIRLPOOL 076e8f4fe92b02ce2ba2ff73e041433d06ea5f33f6ae96f3d534f3b30072bffcfe059e18222cae8a92e7cc013c587f4fa88e1658f3d71bbb9e0b7c2bcc8d6ad2
EBUILD calculate-utilities-3.2.0_alpha7-r2.ebuild 821 SHA256 7ef43200747ff7d85fd2becce9987ee0b658fd42c34427f9d2601952d6918889 SHA512 8b64af11856483b9e38735d87fa7925a6482f58c8d14ffcd6db76abb7dd0dc5da1fc8397aa01c74fc889a380213758ad5411a7d06bb1babfe9edced5f07a2261 WHIRLPOOL 869cde8fef89f4a420bbc3a30552b46f19982210e10c49dfbbcc19660f0e052167760b7db848faaece8fcbbfefc22f7361be304ea212c07505aee3b8ccb69061
EBUILD calculate-utilities-3.2.0_alpha7.ebuild 812 SHA256 2e1a475c177becfdef6b09c791b5368c8a53a9f1d6435dc03942946849e2d8bd SHA512 79fb92473c9d4895e51974bd5a8b0e0c0731aed43e43d7816c4c3e76e9d91e6b1ee920582184ebbf15f1424a07ca62c35cdf4d4fe98faaf182e31c5cdeb15ffd WHIRLPOOL beb4ed8df392536651e562da8b3c87fad9f30165828bbba835f9c62181e0fd5f240a70fac47af45fce24462d3cc75d891b384d257bc5639cae5fdc939dee4cd0
EBUILD calculate-utilities-3.2.9999.ebuild 800 SHA256 acbb7a4e34387baa1ade9bf97637972fbfc97afa56367381d622198b5237e983 SHA512 9e0c74eb499157b6d3ace20d7e9da630660e46b74a6d575e222e1638c87f85660635187489b9312a45f193780c301d87c1dbb9a0f60414e178e8f54080c71ffd WHIRLPOOL 9b56f590f36d29d3518c66c453f97b14d083e36b62adb70a8916ae4e30b527431602a9edd40d703e5cb4296a01f8c982157b602651ee57a9c0ddb7a4c6aa2fe1

26
sys-apps/calculate-utilities/calculate-utilities-3.2.0_alpha7-r2.ebuild
Unescape View File

@ -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_alpha7-r1
=sys-apps/calculate-i18n-3.2.0_alpha7
=sys-apps/calculate-lib-3.2.0_alpha7
=sys-apps/calculate-core-3.2.0_alpha7-r2
=sys-apps/calculate-update-3.2.0_alpha7
cl_client? ( =sys-apps/calculate-client-3.2.0_alpha7-r1 )
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha7 )
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha7 )
cl_console? ( =sys-apps/calculate-console-3.2.0_alpha7 )
"
Write Preview
Loading…
Cancel
Save