Исправлен вывод переменных в методах (calculate-core)

atratsevskiy
Mike Khiretskiy 10 years ago
parent c6b9b45467
commit 11eaf9aa1b

@ -1,6 +1,7 @@
AUX calculate-core-3.1.9-r4.patch 5338 SHA256 ac7374390c65c37785ac42734d177332ca4d36381105ce9cc0ab29b607f07449 SHA512 406fc472e822aefa5aa083891ba15400e89d4fb21dbda24612de67a33afb00f1603457f7f7830ff35be307253b54bd4efe77c3129de96178172a58f26b4f2c6c WHIRLPOOL 676b0bbdfec1aac7d2974c11acb4a45ef0c80241c30fd3153d2c15d7dd9810fcb9da2d47beed6e683984cda857bc401cc1ecec555a79e03214c8e7d10201b57a
AUX calculate-core-3.2.0_alpha11-r1.patch 895 SHA256 cd8eff11d738cc10fb775ea0113c438c641dee72f11012053f594e0d761ce53e SHA512 3a8ebdf369308170c96973faadd53fd2c3be03482465e3623f1bd2c7550caf30acc4dbe79a46c15a8315beaef7bd29b90be3bf1594f15a23cd10834a76137463 WHIRLPOOL 017329ff895d50ce5b830999ca12c18eb48307b97683777dc52f6730d72595682b92ec341bd378f200f3b41f6d13f1f3c5069c5b95f50a632f770488cbab389b
AUX calculate-core-3.2.0_alpha11-r2.patch 4459 SHA256 236efc35218f96a80f1861b89ab133a7b564d611fd4ee596393d40bb11d92a33 SHA512 022a61bedcc159aac082c0d227efc521f351815ff27383e45ca805bcadc2780c6171e438e7fa04e5dcc1f81fcec736e8abda47f72999d8d822dca042ad40b5d6 WHIRLPOOL 122eb60f05221d10fe6eb405c4b3a2d271f77d21cfda03fbb3225640776af178799508423b2af1eb4c35d56129c44c284b62eca8cadad2c1e597ed202217756a
AUX calculate-core-3.2.0_beta1-r1.patch 1204 SHA256 feb9b0adc34d5c037dd3b477ba4964bee7bb73776d529f18ebe626495379ea73 SHA512 8aeeec44b528015eaea5556c6631fc073aad83ec37def922b93961deeb162ef4900bc7f432bc8f766b976afb67d7346e3cc43f084621c1cc4a9048bafa0e8389 WHIRLPOOL ee69071a7a795cb62d541804511a1f4d1afb8e3fdae37fa00c82c0c8c4bc31bb7884f2c1c69c712b54e76f5c0e72ee6ef6990cc432259ff8b7c7833565580362
DIST calculate-core-3.1.9.tar.bz2 83760 SHA256 c7e08d1e127b32196ff55c1c0b2c58d4eb805d06604edae0d76c8bc61e0427c3 SHA512 e0124f3d40cbba1a147a11949c3f57218def6ae37575a059fb1a37c111d1d29d8dcef9a4927c7ce7fce172ca405bcf225800bed3b00d05e3a663db13e7f45e74 WHIRLPOOL 18926257d8cc4a237c08f4354eac0fa5ce82162fb8a13aa5de5d31b53ee9acb4d3b1320edb746cd552fdacbfce30405d0092d9e6be661e04c74384803459a4fc
DIST calculate-core-3.2.0_alpha11.tar.bz2 88248 SHA256 67d04e8a8cf91f9fc27e16c8e87279aa02a721ad42a748a3ad7b5dcec1d1de68 SHA512 a8cde2db1967d2285d5d1f7a85ea491f5e7207f8da2e812e164c4cd3d36ecbb823e2946a2f3586e09adf2eff7a6911bd5277f06a151f1351adef845b07ce2c41 WHIRLPOOL 199dd4ff70fb79a30a1d8b7f0df0fb009b4506d567932d892cfeff560d26fb9308ea923bb3c1a69c298545b7f033b8a880e6ef0367624d5b2cff25ce8b0828c0
DIST calculate-core-3.2.0_alpha12.tar.bz2 88687 SHA256 e6c990745af8914b9e941e6a11535774978fac8f5b1c39f5602368d8ad766c36 SHA512 de5378b3f87037ad07bc64085a4bb9ae7a817b7bfa870a3d261cafb0147a98f89dc0d30c3259b8928f6b9cfd866b841c5f40a78c150cf931683509de29c8798b WHIRLPOOL 1c162a2554b55aba682fafb01efa97b2f96ab9d068e5a87bd59f674236c06970fbf5eda84501d956bacd6bfcc4486fb97dedfab80580e9c45d0ac16a64331a35
@ -12,6 +13,7 @@ EBUILD calculate-core-3.2.0_alpha11-r1.ebuild 1275 SHA256 72fbe9b2c5a5dd562e9f9e
EBUILD calculate-core-3.2.0_alpha11-r2.ebuild 1273 SHA256 6be1bb0636ef29f2d9ec51b32568898828ef899512cad301bb6f7f276ac4398d SHA512 cabf752b63b8137589955ddbfbe27b470848109c409e606f1ecefc0848cecaa43bfeb75137eca9e665f16dc9c91bc5db088a321507e041fd83f742b2a82e3aff WHIRLPOOL aef5a96c7a8043a9faf4e0eeec09ad286a04b159ae739c05589d09693213951d7f8d1b6b6dfcbc1ef200ecf8de26c2edc7c0d6218710eec4c8ba37bdb4ff6f9d
EBUILD calculate-core-3.2.0_alpha12-r1.ebuild 1141 SHA256 f74d3840120cc9308a258af6d7772939397dfdbc4e7c01543cc8a8148d3b4f5f SHA512 5d662133bddb1d287252f52642412f4c3f97c6eed79ebf1c5d894de1b6bf4384a5c9c9d9c8f0d466e5a8a974adb526d5a27567e0edbfd04471d2f1aff40274ba WHIRLPOOL 4fbb41db3c67cea88540696341c403c309e40f94b3041b17b4992ca46877c3e8e421e3b066fa70f78e59667e3203532aaa892382c5537add9bfd70d4058f1b9f
EBUILD calculate-core-3.2.0_alpha12.ebuild 1130 SHA256 262e70acf2dca8808cdc7162431dcec1119783ec185848024d2ff6002037beea SHA512 d6681c3f8e146b8eeb11ff596094aa8596fea8c371421cfa7a63adbd532ab95e2b7e9bf4f897d18649ffdd57952dcca8c8754aba9c3dbb9e5a08de6c0350ad0e WHIRLPOOL a676b23646aa3c80f96855104af7159fc7f0275b6374020448e5524fe1d5d9b7d2e885b6875af439d3c599f945633988380418f55ae7158e6fba0ff466bc8f57
EBUILD calculate-core-3.2.0_beta1-r1.ebuild 1280 SHA256 45537320dc6a02f41f8a81352a9e76a6fead532dd0af560b77c332d2c2b96dfc SHA512 b441abe457c52e48a6e8ec51b90fbe8d2e7f8a77451097b007469ff3373e5b807fed6dec13ada782d79cae2811e984d3b086d3b6800e3a38c1d93cb65bfbbf83 WHIRLPOOL 32f6221d866e9b43d24a9a2c38b7864cb52755e6c53194c620fc250bd566b6a8f06c29e58d96dc59c915ee762a36afc04c526d08dd3b6c20780836aeb1735b3b
EBUILD calculate-core-3.2.0_beta1.ebuild 1139 SHA256 ef006806da8d8d8707fd310062a03d638329994734070c7a673a1bfee2b93f07 SHA512 55b9adb2128f58873bcc330d0739f6b27384c685bdecfadc51c60bd9d8ffe7f625bf5ca1cde714c751b748205234579849cd6a7f9906300957bb490bdffc01f5 WHIRLPOOL 1eedb7651360fb50a84ecff4af2261fbff86fc90cbd44b639f41a0716e6f787e50141e9272b36650e370268bd8cc66040a225849c4d5f0ff3da579fa4fee842d
EBUILD calculate-core-3.2.9999.ebuild 667 SHA256 f3a018c25ef0e308bfd9fae1baa1f48b9bfd9881e2b902a2bdf303ed51c94860 SHA512 bc463857f5f83a91178c4d30e1bea32f15fc4204930b1589ed40d7987a2c706fe7fbe3e4591702fd30b25bce49e56c02c9a0d6a61cf83215ed278f47511ef293 WHIRLPOOL 187c583696d5030a261e3cfdcdb38d66055c68ccf1ac8e8ae3ce418b34784f91922cedefeaa9f367f649ffcd0dd1f330a80d98afd734081a505ee472134335fd
MISC ChangeLog 382 SHA256 ce74a6d08ec1ea80ee021f5378f705102435abfcd5304d851c3f7932a967065e SHA512 f5531edead30072e8fb8f278cad1d265762b8ecdf146b86cf514704f373f2bd8068b3ed35e68186687f83129814b73c6269024d442fb592515c72a9d0e6d3ca1 WHIRLPOOL 48571b2986c2f8797109a3a3440a43f4f87b601e8e52bd41a470bd077b37eb2b6118e6baf86179df065aa2e4a840d9501b2b2455b990a19dfaa2d4ee7784c922

@ -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-r1.patch"
}

@ -0,0 +1,22 @@
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",

@ -21,6 +21,7 @@ EBUILD calculate-utilities-3.2.0_alpha12-r7.ebuild 836 SHA256 0d738eb296cf7b9df9
EBUILD calculate-utilities-3.2.0_alpha12-r8.ebuild 836 SHA256 5bb6e0713d51a324d8ae7f7370ca10fbb30eea19f38e7eec6d625fe9229d2a8f SHA512 36501ff47d15d135a5a6fc032b0ec6e5325c118631606e3fd254921cff5c73782b91815fe4d4e1e0a13ce3ac6bad9a2a28204c523ccf8ef42f2cbd3f12622af8 WHIRLPOOL 350279f92388f52c3c8009e396f24550cffb822920de731bfb78e0d48da3b6b3465bcf6ef8b86526aa1efca4beaa679f8765f4dbf99cf7e2e6f77e911c45cfed
EBUILD calculate-utilities-3.2.0_alpha12-r9.ebuild 836 SHA256 22d1521496b4c468fc47627355a91ca27dd591f2281768aa0a46d3cc353bb9de SHA512 7b518f7c5b890767bf538bd038b872abc1bf00604644e7ebec24098e8b38ee053fb32c25864b0c81440f2ae11679d69f6700159fcac6f9837422b3053c6ac3d2 WHIRLPOOL 270c4a38e596df78e7176d4f82a07f63c93d29eb80d438d457ad1924c894472ce574b67c77dc5f105d9e5a4c649f73edb712ebbb224c696a0ac040ca12e70195
EBUILD calculate-utilities-3.2.0_alpha12.ebuild 821 SHA256 89132b0411b87f5424a54b76a076e33214ed1ea7174fe1be14fb2c9b57acf884 SHA512 6960fb7b9a8b35b7041b40ba4d6276c142bb865918d1275d37f67d746213abe2dc60b701bf0c7c00d7492fbebfd5575d41e53dea4ffe0981cc0c775b665ab960 WHIRLPOOL 66282f7e9398fdc03c08dcfe9c595b084382b91c2580c1e906efdca52b94a582511e41f866e20487be53ebef1264f8b8cbbb64e6637de2df71b05501fbde6730
EBUILD calculate-utilities-3.2.0_beta1-r1.ebuild 806 SHA256 f0bee40c936a8fae4d6b03e45f5480ec3777e592963b4d70ceecfa1d348853a0 SHA512 fe4514bad6f97274e356f7496a74750ddb8b14f0cecaee0b0fdd23f1d6b7761bb174cbec7393bbf103b31a19ead4ca5f2be94ae432fe5374159208084df36278 WHIRLPOOL 4c89503b5c251400d83d143acee93acf7f7cbfc2399e93aae76dbdaea086f5624c3597bed361023f63925166e2a76a27bf127556387fe41ecee9dfcb8e7c69bb
EBUILD calculate-utilities-3.2.0_beta1.ebuild 803 SHA256 61092943e71177c34f60caa607f65ed9efcce895840d49be7f3a764aa7a5df4a SHA512 6cc5b9658f4f47daefead300c6c3ead06628eb35d1f5f8e01a9279c6f1a21c5c48d632ef751633537a23e68d60e7453a284d7ad0922988688d70a57d7c478a90 WHIRLPOOL e5805dd4b8c796472cc069f3411e707b4bb15bee57503e716d0b31d8fc224ee20b3e72a8deb0876e8b3ec619208e657c9c5b664b4d5fb0e950f1cdfe1bb8b750
EBUILD calculate-utilities-3.2.9999.ebuild 800 SHA256 acbb7a4e34387baa1ade9bf97637972fbfc97afa56367381d622198b5237e983 SHA512 9e0c74eb499157b6d3ace20d7e9da630660e46b74a6d575e222e1638c87f85660635187489b9312a45f193780c301d87c1dbb9a0f60414e178e8f54080c71ffd WHIRLPOOL 9b56f590f36d29d3518c66c453f97b14d083e36b62adb70a8916ae4e30b527431602a9edd40d703e5cb4296a01f8c982157b602651ee57a9c0ddb7a4c6aa2fe1
MISC ChangeLog 38731 SHA256 7e70a0bc1f3b34c0011f3874773a698a4bb96eb6d3dad10903575156bb8578bc SHA512 2de466ea990b9eac702b81fd097c3f5d06d1f4db1a4bd1d1b7380b45e551f6fd62c16564ecfc810246157d3ef1113ae373041580e70981d44752e50ed6134bc0 WHIRLPOOL 5ca0cee1ad0e9419f91ec11a9629b9a29db9fcbed4f5ae0aef1f8a2170ff58112c8580d61884c56ee410a0abc201fa8f4419cea35077fc8bb84e733f6fa6f4db

@ -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
=sys-apps/calculate-i18n-3.2.0_beta1
=sys-apps/calculate-lib-3.2.0_beta1
=sys-apps/calculate-core-3.2.0_beta1-r1
=sys-apps/calculate-update-3.2.0_beta1
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 )
cl_console? ( =sys-apps/calculate-console-3.2.0_beta1 )
"
Loading…
Cancel
Save