Обновление утилит 3.1.7

atratsevskiy
Mike khiretskiy 11 years ago
parent e837a7076e
commit 6ae9f272fd

@ -7,6 +7,7 @@ AUX calculate-core-3.1.6-r1.patch 2047 SHA256 b53e520611361cd4d576a7ed091e44e205
AUX calculate-core-3.1.7-r1.patch 392 SHA256 15c23e5b6013208ed68766f9667e6a45711cfe636188100f27a26bd1b271f062 SHA512 d055f53953ee37d2d8548e3406badd3d7745996fbfa8e982b412e090135c8acd1024708779b982a6a7bf1fc0a442b3d477a4c5dadd5ef7a404be4dc24dbd7ca4 WHIRLPOOL a36521fbd55a668fd564691667252247ac9d55bf311e434ec02ce950df2fdfa224f52fd7b0bc055f6ed8277dc956effd803069223443bedc2004221981e8fc7a
AUX calculate-core-3.1.7-r2.patch 1952 SHA256 0ae2f519985954f88e29ffff68311f00c2b37ee07b2b0e8e08010110e637d240 SHA512 7f1f4bf9d6d816bf0dadae453494d72c7e7b6a25fd35ae05a5ffb00a1409830afccd55c13954abe1b6c10c9004e487078bfd432a07691e0bac66ea9ab922d1b2 WHIRLPOOL c433721e05006de3c54db7da628542c328221eba3194f0e750a60a681722583d347c032c7bff00f949add51ee87b86c445453656c0c84ea6674512cf9ec20a13
AUX calculate-core-3.1.7-r3.patch 2433 SHA256 5faaf6d9645dd864f22d1337e2b29bbefa6c6a5889653500832f6b0cc8e0e8b7 SHA512 247fce48e20f36d15d78c1733f3aec8d6df5150a75912aa7bd6420f9c11c18a53b6fec094160db295542e5642f5a2ed21e422e8a43f6d86ff42a4c2be2eba0f4 WHIRLPOOL da927b1e435266fe8b0dc9f3df29c1a1f4675da2b0d2c558c1b96b4e6ed45df4c68e0833116df3d06543705e56af1603ec5aac8aff5bbef530bb1be890799ec2
AUX calculate-core-3.1.7-r4.patch 3538 SHA256 af83b8abb18e6d8f6d27dcaac950846a38026e8b39d78c3f360d345446aa7c96 SHA512 80f1ce0bac6c03892d3707a981b3b577b9df185d6d4e0328db229cbb617137aa5689c8343a742e999b61038fbf07a65641a682d9475a9aa57ad10123bbaab31b WHIRLPOOL 5d5f75dd5bf8a3d244b67142d61fc38bee1dbfc52f617d15fcc36d921d5f04005b95d7f5862927e01b52ecafadbeeb91b97f054d7d7ec09c363028a7ccd52118
DIST calculate-core-3.1.5.tar.bz2 85114 SHA256 afee468462f6e838e2f165cacf675f7134f48302e0a7d74e9f910093ee1ec25d SHA512 c3218116abd4fc1e864df1abcad2959042f67eb1847ddce6b28237bebbd354a10720562c96820ea7ba22488630ee7c5abb1a8507cb1ddf88019d8a50007c6a0b WHIRLPOOL cc605fe5d9a50a210f97462f8c059efbf40984d17f1d18ecbf432ba2fcfc3112d034a09bfc43de3b0983d1c742735182870f48626f7897b8f36c522491af4fac
DIST calculate-core-3.1.6.tar.bz2 85099 SHA256 d582745a4b211202587cc8eda828bac8d69d5cf533e71ff51e0f3b27b15571a5 SHA512 63f9503be189af52cdcf917ab95841fa7030d181e25ff3910dba68ee0289590867ce1fe865a7c4dba778809ee43311067d4671330e8c5788397c83e162cd54e4 WHIRLPOOL ca9556855388168eb1b2b6cd4e4c7c8c879ac21cd79bede8ca6b2d765e57a52841ad1ac165bdbb9b99a8130942fa2b712bf7f09bb25e9941993225061bce97ab
DIST calculate-core-3.1.7.tar.bz2 83298 SHA256 3ecda86e199fe360362de9a43c9a0a53250512c430c8f5da42c611dc9f932f86 SHA512 fc197cc253ea4ad15e5010b894c516d07745155b78ea7d365eeb656dc680b0d2815596bb9de2d8c9e95dd9da27d10205651f8d199e9ec5a8fbaf410167f39a11 WHIRLPOOL e8b8b2f1031919e3d2832bce12b23b7cceae8216aa95c39f571afb88afdf745546d0afa4d6588f8236b772c04bde0babbf8ce6e1b6be996eac035328b307f86b
@ -17,6 +18,7 @@ EBUILD calculate-core-3.1.6.ebuild 1122 SHA256 1ebad16aafaee205ea57330d73e6c22a1
EBUILD calculate-core-3.1.7-r1.ebuild 1257 SHA256 29c2f9d309a5630bccbd95e3423fb4f7d693512c82ffb0345ae1d8acf35a0574 SHA512 590ebbe0b36f5d9ddd358635791a757e90fca37aaef3e7787d261a60372684688439df1640d8c2712bebd46cf17f92bcfd4b25cbb842425ec4dae4292801f451 WHIRLPOOL 68efbe71d58c01e2c438507fa944d362d680ffeb5c7a8117956b57f47a5347d03ca233d7f2dc5ec9265100213a36e4cdfb7514e06d693691b33d58358b7a91bb
EBUILD calculate-core-3.1.7-r2.ebuild 1257 SHA256 bc88f4422a5daeadcf7731e3f71c5c44f3724d828cb9ce401e90c60600fefa65 SHA512 6e786d118408136ec592ea4f96b8dc7a5554cb2df75000c92e98faddbfff5b2f19b014c1c1a92b7b71e1406d708a24e92667e2fea5be9a147d5ae583b481251d WHIRLPOOL 46932264ceac832d89c5dbd9b26cfbc88810240a63bdf8a0b88289e24e62632c2641e9bfbf423c1a8081ead5e952bb3b02ba982cd0537078f5db79bac76c1fad
EBUILD calculate-core-3.1.7-r3.ebuild 1257 SHA256 a1f9438879f5a1d98c315edf27a1059644170e90566a7fb9c84e676e604df73f SHA512 1863adf0ee3380580111aeb497508ecd9e2b8768aeab4ed2ec7a1d97bcdf56d2f97ead9c7a8628e897bbe407bac0e5d9ceabb7507509deba810632ea0174af6e WHIRLPOOL dd3109d22cdf414aa1c9bb9ddadb241061bc74fa3ce9a825ca9396a1cb2e58063a724ebe4598fe3f68b51c1d9b9ef08335a88695788a92978db6fb93059a066c
EBUILD calculate-core-3.1.7-r4.ebuild 1257 SHA256 bb3ef11815ab41231aaafa9231a24be5e9f8655ceaed371a3abd0ac47256304c SHA512 872c29932cb8103c8d06bbc575365648704781c916c67dd49f298ccb723f7eeec618849af8b3cb79c8fed0f84997972c77b43d6ff89fa3dcad8dcf70ba0b85c4 WHIRLPOOL b822f0d1fdc0c24d88d0f5b2d7387aa083bb150ba36af8aa507ffe460c4e7e2ea63d08bb1cdfb67ad1b1746710406a64ce29a272fd3d099620e70de17ab982eb
EBUILD calculate-core-3.1.7.ebuild 1122 SHA256 b1273517f9e91b41e2b0ed784e3e16d259486ea68db3612b49d96c557c0005a9 SHA512 55ab3996f0c69f9240a3c6b09ff2a28929b8f814b4f23dcc5ac3d0fc23e914f782eac61979a3eee6a56ae718fa8e3fa94a4e3775b2719756ac6278c4fdfa41fe WHIRLPOOL 5f114887f6a3ccb4bc684603a30f48dfcc501d2054fd290011bb849757e5cbb2ee667eabc5d7cf228f16af468e1ec55df1dbc67208e8169188e6f3121a945e7b
EBUILD calculate-core-3.1.7_alpha3.ebuild 1120 SHA256 159f295c2aa1ec1d15bc9c8f3cba33a6c5d86272af4f1c7a91de84541cd4bafa SHA512 271430ec591da7aba0a1c39f60b2198b06a2dbbe6afe0a4b3ec3bd0d98fce63c4ea5f6ef1a26bc1046ad6aa6752cc9d7d203cf196b0da485dfb17d710c2e0b72 WHIRLPOOL fa06221b99e50b8aa5a5ebc1db4d14aa1ddae7a4d9e49fe4cfa3a51cf5c38ea9a5fb845bdd2f47efcc6552cde686c08803b35c3069687354bfb68ad35bda7edb
EBUILD calculate-core-3.1.9999.ebuild 656 SHA256 475e34d10141354a4c60e029fc1cb74b080c3a1371d9e1e44a5e2936b7130ed4 SHA512 9ba865c5effa56079a3841a96d1a4a89d4bbc27e092042aa4a87d1b4ecde9d3a690c92c73e10b330724258aaf3138d2a58d50d18d2fbea9e657c3c5d2f8395ee WHIRLPOOL 89d3bcc657324d1ffb4265eab3e28e94e3d00fb7530c6654e75b52fe002d70f72998930729cfe3320a3ff571277e6e59c649b0df2fe071bcd9b050f9d42608eb

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

@ -0,0 +1,86 @@
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/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_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):
"""

@ -22,6 +22,7 @@ AUX calculate-install-3.1.6-r3.patch 7194 SHA256 2e4d5e73bb4d18dbe25f508e0586c4d
AUX calculate-install-3.1.7-r1.patch 520 SHA256 8f8e8652715f83fe252caa3bd06dc30775e7ed7b87c150b806b117c2dad7b9bd SHA512 5572acf3aaacd1dc6d52abf33b45a5bde1a3066dbd706f66a4c3007367673d91af4c00fa1b5bed704396207a03649401c6d22c4000cfca59f77a67584df6739c WHIRLPOOL aae66e716ddee14f986639b2111016aeb548bd338393d5a59fd05e127949515fa92c5eb1c08b9a11016e42782981460eba10084c514fcc722aa74c7611e46f87
AUX calculate-install-3.1.7-r2.patch 1036 SHA256 ea47ef462c5e2e823a6ab25dbea67cd4fbac2a3488bc24c5a2667b979f05bc3b SHA512 fefaed934fa392d446855e3bb2d8656ee08187ae1c4166a1d65b469eca6c46737436b8dd0190c4956725b6dbe78af9967c15d76dd8cb66507f6e253448e44fc8 WHIRLPOOL c2835c153e17962a60dd36e632cbf8651450b5788694cf5d5697f9ba14c110cd51e20c3a5232cc140adbce6b3296c6e9f87728ddd79f77321680b2f90ae65d4d
AUX calculate-install-3.1.7-r3.patch 8292 SHA256 d40e8fc5c970e0fbfda665af5d162c86ce82813c0a77753ab40c5a2b3b558617 SHA512 7999f8a607d5636153a5586746e3a0dd7d60cfc810418028a20e69aa13cde91132f4626dda3df3abcd24070f028372a445719bca2d84c9178b12a41380e0bdee WHIRLPOOL 31cc1c82a0f09eb679d28cb641e05c0a4a36c99a4f6c82c21f8ed9c4ab8412ce592cbc08f5dcec650ea897eadd96347954a3e4d9cb94f0c60d394cb3d31b6665
AUX calculate-install-3.1.7-r4.patch 12981 SHA256 63ee0a2d33ae17b71488274b5369b7acadb3f5afdc19051583ceabe5cc7a583b SHA512 7a5abc8ccc858dc170a16262c13b6848ed1e27d8303ec62d818bc41dfb1f20a2f19728f417060acacfe9d5587426ed0e72a68b509b0aee88e9507ee639249724 WHIRLPOOL 15db8226fa82f943ffb63ee19ea97f096db20ce7c3cdbeb4c03e11ab69b2f6ef9b7ec73152eea7a0a9840596862b96996a8b39f9f4b8d28d086a0916e15a3a32
DIST calculate-install-3.1.5.tar.bz2 77476 SHA256 e423d2728cf7d6a7d1a3819adcb970da3f4af8b1c380bc81e92f94754d64115f SHA512 bd8b25799d0f6881691123dc04d2ce78c244d666e9da006b1f9d0ac37581f46d0b5bd4d0e671af650bdcd1018b8c463d4fcb0032d5da0ed24cc5e0df48030af6 WHIRLPOOL 5b1ea10254689614722aeeac398169ffb23d9302ad3e2800e558ae5beeeb4f24644fdaf74260134e89896ebc11cb527b4d66b80424500565a9036237808086b8
DIST calculate-install-3.1.6.tar.bz2 77530 SHA256 799a353e4ca01318508183d5e8a1eb205eba071dc60da00788dfc20449fdffbc SHA512 cd824bf699c63aeec3527fb51fa01737d44d5b41d50126b5553ed6d175a2ce8d46fedbbaf0b69a973f951bee559cce38c974c803c171493f0a9a4c76cd174ed4 WHIRLPOOL db65b051b7c354c35484d957d1c5f25ec04dd8be8246d6ee8551bc8c3fee8cfab98cacb8ca3ac653641d81318d17895edfc155aa45b522460be5f538bb357062
DIST calculate-install-3.1.7.tar.bz2 76300 SHA256 d8c7e4fa93bb7e039b35af18f4febe3f12c7286265adde7e3de6c46591227858 SHA512 06374b95631061e16d98315921b98cd6e5902154ec2ec7a30a8382782a0ffbb54b49a1a32cca4000dfaf9f9f10121df0869fc00520c176f348220b8d6a952026 WHIRLPOOL 3cd6a87766e61c158aa4d75da86bc7761c2309cffaf49c4a0e11fbcfa3e70a39a46bf5640758e2f6e8a260b1e5244a45d72263199e8507068a54e9abdd93c9ce
@ -34,6 +35,7 @@ EBUILD calculate-install-3.1.6.ebuild 907 SHA256 33527703fef3598925222ffdfb68e90
EBUILD calculate-install-3.1.7-r1.ebuild 1043 SHA256 669aeedb9156306211aee21c6ece5883782ba506e5d9ea9ee28086515fb2a300 SHA512 2370e32ae9cd82d0d96b1bdfe716cfc7fbba6ed4a1abd46e97c6d832e82130c63e8bf930fce33782596e841993c3267e354124bb0cd56e43b1de70cd3034b644 WHIRLPOOL f2b1e9a2c0279fafa1f8814e9a5f180da4fd85f740fe46f35e36cc2c0f69e01e5a10c6e0b926e0e91480e7d18088cd1d1e219f75791d66ec7d5c92955343ae5b
EBUILD calculate-install-3.1.7-r2.ebuild 1043 SHA256 66774a8f1889b74dae99829421ef49c9117e075a5f74751cf0f558bf91d2cf3b SHA512 88452482bd3ce6e0f31b605ceff66e7762064935cde63e6dd0f21e9adf6696fcf166ee924d8b2da6bcb50650d23f034998657122f42ee825a3c91a5e5de73f24 WHIRLPOOL 28d5b6de77053360f29876f80ff2adb28930347aa8bb272f7253e781feb42f7c2a77dc1d3556443da38c2be5d97d5dadfbdd0e1fefe4a5c3e83023ba1b0523ff
EBUILD calculate-install-3.1.7-r3.ebuild 1043 SHA256 9024673092da48146f97a8a23dcbbad6558cb36cff5a0877773059ccb6d73bee SHA512 338503e9499720ebc553d645b0c551f930b510644205f30badfd5a89702f158bcbaa77bd215315fb985e4a803ca0cc5af062b4bd8dee29e82cfcbb4b22690410 WHIRLPOOL 2750a5d7c732faaeee5db1256d6602ec1c23f787437f57858282710e22ca8e4e130ceb16540fba1a1279202305c8ffd180f4fe029231bef4460308432d0ea4ee
EBUILD calculate-install-3.1.7-r4.ebuild 1043 SHA256 5626babb505f3f10e2de7ec748ec6c89b84c9e4d1edbeda36423924bb4f55028 SHA512 9df4b39bc1d8bed64f6b93f405db1c2c857fe0550a343a92b6f0a4ffb7bec94918f9775a0d077d8aaaaaab00867c2716a2221c6cf14080a8b5a3db74bb938d2f WHIRLPOOL 59d640d36b7fe4a9f40a8dd0e5743b572b8456513f2de9a2aee793490b4a2f1513a0aa985a07adb9749c11e29c3660d784fa0482f65270b4afcfa5ff8c7cac9c
EBUILD calculate-install-3.1.7.ebuild 905 SHA256 0b2c216b63a22a08c992c79f29716bb30c707dd16ef1fb6ad4d96b7f8dee4e12 SHA512 197e6a774b11b3bc132406b9f8ea6db0d75a65705b2f49eaabd639c20268ade04693e237b1f7aad394a58d4435c67fb5a7d69f4a4d8b9eaff0258a4cfc7c0b96 WHIRLPOOL f699d1dd054775dd99a0d887b6e1dbad75a930f40d43f17be1923bd6757fddb69872733eebc6dddbbc97fac316d43183da5bf9788c5300c7df48b72c94a34077
EBUILD calculate-install-3.1.7_alpha3.ebuild 903 SHA256 f46a82b8ce98a91fb985b89842c4dc9fdf9df9270cccb0f29a20356461926526 SHA512 4a773306fb813922ca15f988659db910ab5abf923d73b9393851410afaffc7623f6d5f7d6f8e89e6add737b04d0a9444a32465815a26b4a3c808f0c523fba7f0 WHIRLPOOL 57680c7304dab947405672dd3ddd15459a49b41b71e8f6496c4e004820c66b9aeaf4b4af3032603338c33af28a1863dcf9fec9d0c57608500bd9352b781070a3
EBUILD calculate-install-3.1.9999.ebuild 683 SHA256 e97dd6f046d54a16eee281fa35790c92507b150bc940f3c2b36117e6f44f0a8d SHA512 c1179c500dcaa48506f6334e9e2ccc3cc70d712b2899d7e1d9265bc202f088ab71baa1aaea462deee56fdd5244bee4ab9b9a9da72f25ec511d4f2fa0c3c35f43 WHIRLPOOL 010d35b929fce496b5f16228688e23a95c9c87ebed0d290eeb454e5c1432b55b3b276dfb5786a27222543446a1090ce2f133d80373649fe72341b508d1e16a78

@ -0,0 +1,44 @@
# 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 program of installation Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="pxe minimal"
DEPEND="~sys-apps/calculate-core-3.1.7
!<sys-apps/calculate-install-2.2.29
app-portage/layman
>=virtual/udev-197
!app-misc/livecd-tools
sys-apps/iproute2[-minimal]
!minimal? ( sys-boot/grub
sys-apps/gptfdisk
>=sys-apps/util-linux-2.19.1
sys-fs/dosfstools
sys-fs/squashfs-tools
sys-block/parted )
pxe? ( sys-apps/calculate-server
net-ftp/tftp-hpa
net-misc/dhcp
net-fs/nfs-utils )"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-install-3.1.7-r4.patch"
}

@ -0,0 +1,295 @@
diff --git install/distr.py install/distr.py
index be23d8e..545168b 100644
--- install/distr.py
+++ install/distr.py
@@ -458,7 +458,7 @@ class Distributive(object):
PartitionDistributive:"partdir"}
extname = mapExtName.get(distr.__class__,"")
image = distr.convertToDirectory()
- except Exception,e:
+ except Exception as e:
if distr:
distr.close()
return {}.copy()
diff --git install/install.py install/install.py
index 9456d36..3ae3eb9 100644
--- install/install.py
+++ install/install.py
@@ -400,7 +400,7 @@ class Install:
'lvm_vgname' название группы томов LVM, bios_grub - создавать
bios_grub раздел
"""
- ap = Autopartition()
+ ap = AutoPartition()
ap.clearLvm(devices,self.clVars)
ap.clearRaid(devices,self.clVars)
ap.recreateSpace(table,devices,data,lvm,lvm_vgname,bios_grub)
diff --git install/utils/cl_setup.py install/utils/cl_setup.py
index 39b8ba6..c5622dc 100644
--- install/utils/cl_setup.py
+++ install/utils/cl_setup.py
@@ -25,19 +25,48 @@ from calculate.install.install import (MigrationError, TemplatesError,
setLocalTranslate('cl_install3',sys.modules[__name__])
__ = getLazyLocalTranslate(_)
-class ClSetupSystemAction(Action):
+class ClSetupVideoAction(Action):
"""
- Объект настройки всех параметров системы
+ Действие для настройки параметров видео
"""
# ошибки, которые отображаются без подробностей
native_error = (FilesError,MigrationError, TemplatesError,
InstallError, AutopartitionError, DistributiveError)
- addon_tasks = []
- templateTaskMessage = __("System are being configured")
- successMessage = __("System configured!")
- failedMessage = __("Failed to configure the system!")
+
+ templateTaskMessage = __("Video settings are being configured")
+ successMessage = __("Video settings configured!")
+ failedMessage = __("Failed to configure the video settings!")
interruptMessage = __("Configuration manually interrupted")
+ addon_tasks = [
+ # проверить и настроить параметры для nvidia драйвера
+ {'name':'check_video',
+ 'message':__("Checking the video driver"),
+ 'method':'Install.checkVideoDriver()',
+ },
+ {'name':'setup_opengl',
+ 'message':__("Configuring OpenGL"),
+ 'method':'Install.setupOpenGL()',
+ },
+ {'name':'reboot',
+ 'warning':__("To apply the changes, reboot the system"),
+ 'condition': lambda dv:(dv.Get('os_x11_video_drv') != \
+ dv.Get('os_install_x11_video_drv') and \
+ (dv.Get('os_x11_video_drv') in dv.Get('os_x11_kms_video_drv') \
+ or dv.Get('os_install_x11_video_drv') \
+ in dv.Get('os_x11_kms_video_drv')))
+ },
+ {'name':'restart',
+ 'warning':__("To apply the changes, restart the X server"),
+ 'condition': lambda dv:(dv.Get('os_x11_video_drv') !=
+ dv.Get('os_install_x11_video_drv') and
+ (not dv.Get('os_x11_video_drv') in
+ dv.Get('os_x11_kms_video_drv') and
+ not dv.Get('os_install_x11_video_drv')
+ in dv.Get('os_x11_kms_video_drv')))
+ }
+ ]
+
def __init__(self):
# список задач для дейсвия
self.tasks = [
@@ -52,10 +81,20 @@ class ClSetupSystemAction(Action):
self.tasks.extend(self.addon_tasks)
Action.__init__(self)
+
+class ClSetupSystemAction(ClSetupVideoAction):
+ """
+ Объект настройки всех параметров системы
+ """
+ templateTaskMessage = __("System are being configured")
+ successMessage = __("System configured!")
+ failedMessage = __("Failed to configure the system!")
+
class ClSetupAudioAction(ClSetupSystemAction):
"""
Действие для настройки аудио параметров
"""
+ addon_tasks = []
templateTaskMessage = __("Audio settings are being configured")
successMessage = __("Audio settings configured!")
failedMessage = __("Failed to configure the audio parameters!")
@@ -64,6 +103,7 @@ class ClSetupLocaleAction(ClSetupSystemAction):
"""
Действие для настройки языковых параметров
"""
+ addon_tasks = []
templateTaskMessage = \
__("Localization and time options are being configured")
successMessage = __("System configured!")
@@ -73,6 +113,7 @@ class ClSetupNetworkAction(ClSetupSystemAction):
"""
Действие для настройки аудио параметров
"""
+ addon_tasks = []
templateTaskMessage = __("Network settings are being configured")
successMessage = __("Network settings configured!")
failedMessage = __("Failed to configure the network settings!")
@@ -81,6 +122,7 @@ class ClSetupUsersAction(ClSetupSystemAction):
"""
Действие для настройки пользовательских параметров
"""
+ addon_tasks = []
templateTaskMessage = __("User settings are being configured")
successMessage = __("User settings configured!")
failedMessage = __("Failed to configure the user settings!")
@@ -98,53 +140,17 @@ class ClSetupBootAction(ClSetupSystemAction):
{'name':'prepare_bootloader',
'message':_("Installing the bootloader"),
'method':'Install.prepareBoot(cl_image)',
- 'condition':(lambda dv:dv.Get('os_install_mbr') or
- dv.Get('os_install_uefi_set') == 'on')
+ 'condition':(lambda Get:(Get('os_install_mbr') or
+ Get('os_install_uefi_set') == 'on') and
+ Get('os_root_type') != 'livecd')
},
# изменить IO планировщик
{'name':'change_ioscheduler',
'message':_("Changing the I/O scheduler"),
'method':'Install.changeScheduler(os_install_kernel_scheduler)',
- 'condition':(lambda dv:dv.Select('os_disk_parent',
+ 'condition':(lambda dv:dv.Get('os_root_type') != 'livecd' and
+ dv.Select('os_disk_parent',
where='os_disk_mount',
eq='/',limit=1))
},
]
-
-class ClSetupVideoAction(ClSetupSystemAction):
- """
- Действие для настройки параметров видео
- """
- templateTaskMessage = __("Video settings are being configured")
- successMessage = __("Video settings configured!")
- failedMessage = __("Failed to configure the video settings!")
-
- addon_tasks = [
- # проверить и настроить параметры для nvidia драйвера
- {'name':'check_video',
- 'message':__("Checking the video driver"),
- 'method':'Install.checkVideoDriver()',
- },
- {'name':'setup_opengl',
- 'message':__("Configuring OpenGL"),
- 'method':'Install.setupOpenGL()',
- },
- {'name':'reboot',
- 'warning':__("To apply the changes, reboot the system"),
- 'condition': lambda dv:(dv.Get('os_x11_video_drv') != \
- dv.Get('os_install_x11_video_drv') and \
- (dv.Get('os_x11_video_drv') in dv.Get('os_x11_kms_video_drv') \
- or dv.Get('os_install_x11_video_drv') \
- in dv.Get('os_x11_kms_video_drv')))
- },
- {'name':'restart',
- 'warning':__("To apply the changes, restart the X server"),
- 'condition': lambda dv:(dv.Get('os_x11_video_drv') !=
- dv.Get('os_install_x11_video_drv') and
- (not dv.Get('os_x11_video_drv') in
- dv.Get('os_x11_kms_video_drv') and
- not dv.Get('os_install_x11_video_drv')
- in dv.Get('os_x11_kms_video_drv')))
- }
- ]
-
diff --git install/variables/X11.py install/variables/X11.py
index cd8ef73..3634b02 100644
--- install/variables/X11.py
+++ install/variables/X11.py
@@ -26,6 +26,7 @@ from calculate.lib.utils.common import (getVideoFromXorgLog,
getAvailableVideo, getValueFromCmdLine,
getCompositeFromXorgconf, getVideoFromModules,
getVideoFromVendor,getInstalledVideo)
+from calculate.install.distr import DistributiveError
from calculate.lib.cl_lang import setLocalTranslate
setLocalTranslate('cl_install3',sys.modules[__name__])
@@ -109,10 +110,13 @@ class VariableOsInstallX11VideoAvailable(VideoVariable):
image = self.Get('cl_image')
if image:
with image as distr:
- distrPath = image.getDirectory()
- if isPkgInstalled('xorg-server',prefix=distrPath):
- return sorted(filter(self.supported.__contains__,
- getAvailableVideo(prefix=distrPath)))+['other']
+ try:
+ distrPath = image.getDirectory()
+ if isPkgInstalled('xorg-server',prefix=distrPath):
+ return sorted(filter(self.supported.__contains__,
+ getAvailableVideo(prefix=distrPath)))+['other']
+ except DistributiveError as e:
+ pass
return []
class VariableOsX11KmsVideoDrv(ReadonlyVariable):
diff --git install/variables/kernel.py install/variables/kernel.py
index 9f8c395..2e844ac 100644
--- install/variables/kernel.py
+++ install/variables/kernel.py
@@ -30,6 +30,7 @@ from calculate.lib.utils.common import (getKernelUid,getTupleVersion,
getValueFromCmdLine)
from calculate.lib.utils.device import getUdevDeviceInfo
from itertools import *
+from calculate.install.distr import DistributiveError
class VariableOsInstallKernelScheduler(Variable):
"""
@@ -85,11 +86,14 @@ class VariableOsInstallKernelBfqSet(ReadonlyVariable):
image = self.Get('cl_image')
if image:
with image as distr:
- distrPath = image.getDirectory()
- kernelConfig = path.join(distrPath,"usr/src/linux/.config")
- if filter(lambda x:"CONFIG_IOSCHED_BFQ=y" in x,
- readLinesFile(kernelConfig)):
- return "on"
+ try:
+ distrPath = image.getDirectory()
+ kernelConfig = path.join(distrPath,"usr/src/linux/.config")
+ if filter(lambda x:"CONFIG_IOSCHED_BFQ=y" in x,
+ readLinesFile(kernelConfig)):
+ return "on"
+ except DistributiveError as e:
+ return "off"
return "off"
class VariableOsInstallKernelAttr(Variable):
diff --git install/variables/net.py install/variables/net.py
index a7f2df2..d5cec22 100644
--- install/variables/net.py
+++ install/variables/net.py
@@ -35,6 +35,7 @@ from calculate.lib.utils.portage import isPkgInstalled
from operator import itemgetter
from itertools import *
import hashlib
+from calculate.install.distr import DistributiveError
class NetHelper:
"""
@@ -649,11 +650,14 @@ class VariableOsInstallNetConfAvailable(NetHelper,Variable):
image = self.Get('cl_image')
if image:
with image as distr:
- distrPath = image.getDirectory()
- return map(itemgetter(0,2),
- filter(lambda x:not x[1] or isPkgInstalled(x[1],
- prefix=distrPath),
- mapNetConf))
+ try:
+ distrPath = image.getDirectory()
+ return map(itemgetter(0,2),
+ filter(lambda x:not x[1] or isPkgInstalled(x[1],
+ prefix=distrPath),
+ mapNetConf))
+ except DistributiveError as e:
+ pass
return sorted(map(itemgetter(0,2),mapNetConf[-1:]),key=itemgetter(1))
class VariableOsInstallNetConf(NetHelper,Variable):
diff --git install/variables/system.py install/variables/system.py
index dd5a974..b54aaf8 100644
--- install/variables/system.py
+++ install/variables/system.py
@@ -766,6 +766,6 @@ class VariableOsAudioDefault(Variable):
"""
Audio setting up unavailable for flash installation
"""
- if self.Get('os_install_root_type') != 'flash':
+ if self.Get('os_install_root_type') == 'flash':
return _("Audio configuration unavailable for Flash install")
return ""

@ -27,6 +27,7 @@ EBUILD calculate-utilities-3.1.7-r5.ebuild 764 SHA256 d9901832d0b454813b91567f33
EBUILD calculate-utilities-3.1.7-r6.ebuild 767 SHA256 2349e6099544af78ce503a58a723e4ddacb8fd418b9d297c5c9ca7ec42fa434a SHA512 0badd64c40589751d04b614d1d0849f89abc50346c689f0458144b7093ac9ebfded8d14fbeaeefeb9c0d271cd7437644d2247e6d6c1d3934bcbbdfee141a78b6 WHIRLPOOL e36e290e41bb7bb74412ce2ff8d909da78d002e41b53f4ea6a47c82d30f79149af7d00938986008d26f456e1bd21e6dbfa7ecb94f1b5d2d1daffd026e0b67da8
EBUILD calculate-utilities-3.1.7-r7.ebuild 767 SHA256 aeb502707530dab16be1a8fa9957ba716e9da0414a2773b3b35e2d0db55c8f51 SHA512 ef74d1daea538e12203f42a31a559bb451b0022a3e3cc12d9d6f966a3132ede37e75605953ef5f75893c8af1f1ba1e5b91262ee55407eb76fc2954b82a4c0eae WHIRLPOOL 8ebfa2b93be3924079a1873d7115059dee27725891da09f574e28d56e00040eea762452f831de89d297d6849ac6cdc1c30d862cc9aee61f9aaaa158fa5f2af9d
EBUILD calculate-utilities-3.1.7-r8.ebuild 767 SHA256 aad6f7a199cd0e377db275e9b144c694dcef2f023125ba8e7f4d847bd04527dc SHA512 42ef2b733ba27ef6973d3646aebbdcd741adbb4ae9616365b203429c73b08d984d0be6807f99dab57c552cdaaeb3eb3c855bde8aac01b6f319568f797fc85e65 WHIRLPOOL d59d5642980c48b138561b83f30f709a46c5cf1a94761664d98fcfadce224776edd52f6048db95d3e275ce8a85a13c4478db56c2565ec241d1984112c8711586
EBUILD calculate-utilities-3.1.7-r9.ebuild 767 SHA256 ddd16b9b3d8c7f4c64b767fa7c082a3e42bc95b9c6c538423c369440c8c26cb7 SHA512 69a27abddcdfca02d00dd6f17dcbbd6e25c2ffb8173557e9531b90302d8b97f936ab095a270ee6a7e6f105be1c6116c8c0ef0c03b043fb414084b7e8a303a6e9 WHIRLPOOL 2a659a74c53169024b6634199696b9eb16f2904456bc528554a3f42174e285605b5952705b2f41c6b97a484957d690608323ff0e872371c19d65341c5b12ab99
EBUILD calculate-utilities-3.1.7.ebuild 749 SHA256 5e3c2801a4d882899a36d2725df07a92ff46036f2ac4b6cde93d31e0748f4bed SHA512 a833efd2b4426e09fba7759ed77aa85785302aa57d0d03d2c8e40a418ebdf7b2ea239d0b9ea3d8cb5ea6e6476e0681838d71cb056bfd69c9cefb274044964f13 WHIRLPOOL 54708a1515b3c3ce30a6c65fe7714a61577220f2d05a3292f1cc5e016c6e9b5a74dc6e11b1649e37cc3b8d7994a594148d63d7d9525c6a6459d879aa76e3e567
EBUILD calculate-utilities-3.1.7_alpha3.ebuild 803 SHA256 7c2196a6173f4e8fc50692ab1eaa869e78bceff0ff4eccc71b60f9c4474bced9 SHA512 07fd6dc5f71c83416e36305b0d547e93253df1f1d9588e3d7ae97f017df7198ab83520b6cd631fdb6d5124c16d1ef8ff1b7e1d61949eeca294527e83eb99d22b WHIRLPOOL d140f0a494b8c4b9c12aadd855ce550e1ec7d1e90025182117296c869be255eb077d266c6253ecd5f7af0fd25d0a307909af6bda6003c69268c74141c9c92e8c
EBUILD calculate-utilities-3.1.9999.ebuild 800 SHA256 9de4807341cb552ef8d4f702e9c4a0ca10c52c9d532cc2eb741cea29b92f09b5 SHA512 b35ed4d49c4943a5ad375e646bece419271900c50301153408b30dede0fe834e098baaa42a21c130730c0bc32ba09decc588277da6782d2010c18c9d8df679ae WHIRLPOOL 78e2c5ee8ef8356c4fc0275f920177778925278cad78585ed37c08048241f775030e59a0ced0696fba6379741fe865dc339d190c46b5f2173097328a73c64a24

@ -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-r4
=sys-apps/calculate-i18n-3.1.7
=sys-apps/calculate-lib-3.1.7-r1
=sys-apps/calculate-core-3.1.7-r4
=sys-apps/calculate-update-3.1.7
cl_client? ( =sys-apps/calculate-client-3.1.7-r2 )
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…
Cancel
Save