Исправлене alpha5

mhiretskiy
Mike khiretskiy 10 years ago
parent 5c061848ca
commit 85aa0de713

@ -1,4 +1,5 @@
AUX calculate-console-gui-3.2.0_alpha5-r1.patch 752 SHA256 cc1ce918363673baa06b83e07237a234ea46663a779d5636733143525be9776f SHA512 a13e3c74a17840b95856d8b981ceddf5924178fe647cf7699f3ff4626b252d520a305c25baa26ae16a3c2e9aa2d49b8140c45607be138f1d513dfd9cbb1a0c11 WHIRLPOOL 5c2861bd7663b0355196e604dae304b8e5ecdf446cefdefde67f515157785e7565874907b0ec2cb7f3ed2dc3be1747c5a4f281b828f76b2d5537552a2908bdee
AUX calculate-console-gui-3.2.0_alpha5-r2.patch 3780 SHA256 76f8d2cdef3bdad3fee4f29b828f268561a0cecb41304f7617ea80189cc4b82c SHA512 bb6ffd23be55db7947e12c3319f6c7e2c9c71853e158236c8b8b33e7ac4be049c1b2a5cb0e75702e09bbe4f20455c5c13000905e4b750a345773ff2e15cc7608 WHIRLPOOL a41315ce832dec8e18d81eb4dbdd2471ca097db801f03ffeefade2bbce911ff25f4ebb4d8776b9c033fc19901ccf40d0c013bb86058c84cd8c6d4510127a8576
DIST calculate-console-gui-3.2.0_alpha1.tar.bz2 320250 SHA256 8399ccbe7e1674f969f23eed8c55553cfd0b95a7f4b48ed1fa20d8f5b99996e4 SHA512 c8681b4261b4fb759e7db11c75c6c05cb84dfa21fc49a178b396e4ee255bc88c048b0030ecb51b18e6163a100ecff27466916bcf585bc41310d1d54c9a13fa5c WHIRLPOOL ac7a815f7937bd68d2e3f9d7ef6823c87933dd64b7268a16ca65a151fe17d454aec77fa6e315607b554c372e6b9cf51dd6b4e26ecdbe0143fecc5219770ddc7f
DIST calculate-console-gui-3.2.0_alpha2.tar.bz2 319438 SHA256 73a0a472866a6bcdca5e2f3e9a10229d7d773604a0026807c293829264ac7be9 SHA512 d3064e751bb83a16560942b7e193e4ae1b421a7525f70001990ee7060401d14c7be511ed0eaedaf76cf5e6ac5fbe2782bdbbc5042911c6c5ca7b9b55acc910ef WHIRLPOOL c4d72c404ab61f44537f246b86fa15b7ad9fb6e4c3a2b8661d07a72b1b1a10ca380ccd5239eed652f501f9eee7e2508e8fc6bac2f8560635e809c6da2608529f
DIST calculate-console-gui-3.2.0_alpha3.tar.bz2 319575 SHA256 f808ec79be33f2b81bce0fbff2ef707f92b5c0fbedbda04511283e3bfdf04818 SHA512 151722d110a8f517b94e07010e0d4d93d29c98160e6efaf7558e4d586bafa416bfb1f44e5b21a683492dc66ed9ed37fcb9f81117397f14c8519aa5c1b4ea1940 WHIRLPOOL cb797f7b03d125146c4d875608f3ee8bd6b064d7751762f14fea748abca0f93591808a2a01f149ddc3b4a6574b9aa98fbf66ffd21d821b8b5cf1638e12bc8d91
@ -9,5 +10,6 @@ EBUILD calculate-console-gui-3.2.0_alpha2.ebuild 632 SHA256 b4ff01b5e24307b2a942
EBUILD calculate-console-gui-3.2.0_alpha3.ebuild 632 SHA256 8889c22fff2c7632965b02c4f8a76a53f4a8fe5118f599e70c7f7e6d8e7b7fde SHA512 7a25fc80f81838cc2e7fd10637165303b41b25e507071297ebc5843d2bead0fec66df5557056974c4c09c532810fa6a028e62c5603ebfd1417a4b0ffc6401a1f WHIRLPOOL 15e2060c11d0371c2eb4b67f8fd21cf1bfd633984a7a3aaa62b98ceafcce7dda941653a89142a8acc8d14fb99a78cd02de65fa62156d7eb8972eb8d8d6928e22
EBUILD calculate-console-gui-3.2.0_alpha4.ebuild 632 SHA256 36914290a8191390ce98af80bc9b313c5eeca68713a79d625b7506713137f8df SHA512 5fa1ecca0df9c1c5e54963ad5371e2c90814b3323ff409da1147822b91eed462bf941c78d5fc2b02bf55d1a801e38dfeea3ad7d18f010b740423d19f6b9a722f WHIRLPOOL 4a2f14a5d683ba46f028917f9583f2d37996063fe7edcf6b0159ce0581c69940fcb7a0dedb2be7329841b2f816dc7c60a87c79ded4adb6b210d57fe5d3a30ea2
EBUILD calculate-console-gui-3.2.0_alpha5-r1.ebuild 781 SHA256 189eb57587526334fc9c313f8d6cd2ff269bd0cd9b065e6923289c57410ff082 SHA512 63b2a58e6a76f260a14b5f144d7fdb285ff26420286bc22f213cd77549eea63b82d5bd28cb7715bc26bca7788592d864c4cc0160904b984a73f951ccce8cedd8 WHIRLPOOL 8a6ff7e2a87a78dbf14463e348989e508828165b0abfdc023b914bf717282e0620707ec31b33dc312f5031a16877d22ff428a8b6b13933779497cfe5ba78f7cd
EBUILD calculate-console-gui-3.2.0_alpha5-r2.ebuild 781 SHA256 74de6a6cf7819db7ba6601e6c34a35bee8e91be4bcd5ee75e12993dce3988897 SHA512 c7ef13d78b9219d7c0583f97f133d3141a67b8ef22e9399023efa06fd8f0a453f2f85a6d3dda135b647830ab9e40c28fe5b1776dc471be48caf595662956bed5 WHIRLPOOL 9f0f9a3e605df72066ffcdec11ac68a6d4c4969deda19e5a2e1ebe0398746a07cdfa5dc59e6aff881fedaa366f97551d3aa867ff8ab121577f463e56960b3d23
EBUILD calculate-console-gui-3.2.0_alpha5.ebuild 632 SHA256 efebd40d478fee0259a18b0fe1a674aebd5db2efed085ef291d50673a8eb385b SHA512 d8a987dea6d0a4eac99e0977c7ac594931b961b1acd90cbf2ce00d8dd11e878f2b6ec9093b208be5cc6ba90077b5cd4d1b9d14b34f2cb057cbd9ed2a7de3c1e7 WHIRLPOOL e837e98ec4d7906a8f01813bfdcf7c49ca1adfac512c80de6aad4afa3d1893b5ad36fcd174b2f12b8eb56a5787385ded0bae179cd8b8ea6992ce634677e5ec9b
EBUILD calculate-console-gui-3.2.9999.ebuild 578 SHA256 2a87e98828f92ae2e971b1f5f2927af077e93ed7d3fadacea7f7e232c7a09348 SHA512 15da60d40befc9bba51232dd388df2397aea92ec2b25d951a34fc1a298049602370ac53a98bef42995e3ba911c76bb3a838cf5bfd5a3c4a6af7fc33e0fab34fa WHIRLPOOL 895ac120cb615db6493156e16f0a634da178a667b5c45e122218ce0cc0d6abd096827c506d7cad94f0f613b324cf5d4848e11671caf9b34bbc352ba91d9aa20c

@ -0,0 +1,32 @@
# 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="Qt gui console client for WSDL Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
DEPEND="~sys-apps/calculate-core-3.2.0_alpha5
dev-python/dbus-python
virtual/python-imaging
dev-python/pyside[script]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-console-gui-3.2.0_alpha5-r2.patch"
}

@ -0,0 +1,89 @@
diff --git consolegui/application/ControlButton.py consolegui/application/ControlButton.py
index 3e42fe9..ccd7576 100644
--- consolegui/application/ControlButton.py
+++ consolegui/application/ControlButton.py
@@ -146,6 +146,11 @@ class ControlButtonWgt(QtGui.QWidget):
self.break_button = wgt
self.hlayout.addWidget(wgt)
+ def close_break_button(self):
+ if self.break_button:
+ self.break_button.close()
+ self.break_button = None
+
def _hide(self):
if hasattr (self, 'button_widget'):
self.hlayout.removeWidget(self.button_widget)
@@ -289,7 +294,7 @@ class ControlButtonWgt(QtGui.QWidget):
self.clear_proc_cache_button.setDisabled(True)
sid = int(self.ClientObj.sid)
res = self.ClientObj.client.service.clear_pid_cache(sid, self.pid)
- if (hasattr(self._parent.ClientObj.sys_update_pid) and
+ if (hasattr(self._parent.ClientObj,"sys_update_pid") and
str(self.pid) == str(
self._parent.ClientObj._parent.sys_update_pid)):
self._parent.ClientObj._parent.sys_update_pid = None
diff --git consolegui/application/MainFrameResult.py consolegui/application/MainFrameResult.py
index 8a6498b..44e6c8f 100755
--- consolegui/application/MainFrameResult.py
+++ consolegui/application/MainFrameResult.py
@@ -884,13 +884,14 @@ class MainFrameRes(QtGui.QWidget):
self.send_password_thread.wait()
def closeDialogs(self):
- if hasattr(self,"message") and self.message:
+ if hasattr(self, "message") and self.message:
self.message.close()
self.message = None
- if hasattr(self,"passwd") and self.passwd:
+ if hasattr(self, "passwd") and self.passwd:
self.passwd.close()
self.passwd = None
self._parent.control_button.close_confirmation()
+ self._parent.control_button.close_break_button()
def closeEvent(self, event):
self.timer.stop()
@@ -1042,7 +1043,7 @@ class ButtonDialog(QtGui.QWidget):
show_msg(_('Failed to send the message (password) to the server'))
self.close()
return 1
- self._parent.show_result(result)
+ #self._parent.show_result(result)
self.close()
diff --git consolegui/application/TrayIcon.py consolegui/application/TrayIcon.py
index 9dfe126..fca4379 100644
--- consolegui/application/TrayIcon.py
+++ consolegui/application/TrayIcon.py
@@ -21,7 +21,7 @@ import dbus
from ReturnMessage import ReturnedMessage
from calculate.consolegui.application.pid_information import client_pid_info
-from more import show_msg, get_sid
+from more import show_msg, get_sid, _print
#class MySignal(QtCore.QObject):
# sig = QtCore.Signal(str, str)
@@ -48,7 +48,6 @@ class TrayUpdateSystem(QtCore.QThread):
try:
param_object = create_obj(self._parent.localhost_ClientObj.client,
"update")
- param_object.cl_update_precheck_set = True
meth_result_temp = \
self._parent.localhost_ClientObj.client.service.update(
sid, param_object)
diff --git consolegui/application/more.py consolegui/application/more.py
index c50fbac..e82a91e 100755
--- consolegui/application/more.py
+++ consolegui/application/more.py
@@ -2301,7 +2301,7 @@ class TaskWidget(QtGui.QWidget):
self.text.setMinimumHeight(self.text.sizeHint().height())
self.text.setMinimumWidth(d_w)
self._layout.addWidget(self.text)
- self._layout.setContentsMargins(0, 4, 0, 4)
+ self._layout.setContentsMargins(0, 0, 0, 0)
self._layout.setSpacing(8)
self.status = False

@ -5,6 +5,7 @@ AUX calculate-core-3.2.0_alpha4-r3.patch 16585 SHA256 f51cecc73fd1085e65922a6c17
AUX calculate-core-3.2.0_alpha4-r4.patch 18361 SHA256 75de26bd326759971c8f380f04ec69071811eef6232a6b8c46b842734ab7e36f SHA512 52516c14935340d38a3b03ed980b8aa5d58129300f384b63081041634fecdb46ada91ab43d555b437c12a448d8352854a7d26241dc8d8f562157064f2ff46628 WHIRLPOOL 0978882b8fb860d54a922e193aa5dba71b5834a30ac35452f6493a816139b38749107b6b4a1d0a3ec3dc50dd0a6448e784db4a14f84381c5445ab57a7915fc8a
AUX calculate-core-3.2.0_alpha4-r5.patch 19063 SHA256 8a04d46c14515b93d44f33cb86f61adc0c97d840250ec9b800d9ce753fea571a SHA512 b6b742012f251e018f399e52bb2dfef7cc1c2f570bc02bef1d57a6d20c840e6f3325ce79cc110f60a7adb7d6e3e8f55d96fb44fd18fd49422db6c0c3b2dca816 WHIRLPOOL af6163d19f5e7c6af050aaf65bfd671c250993212f470a87731a6e6accf512c79b9fce49ff8bd12fbdf2dfb89d4360045690821f6e5aa7e3ba36bbc14278561d
AUX calculate-core-3.2.0_alpha5-r1.patch 4276 SHA256 565ca501d01696d5e3d9ac6eccb80e0cd9efcb9c61b97fcfc592387fc4929c64 SHA512 e16b2f27a706e0d388bf06a6c0fb1c9f794e09d7e5373b16f2e3ecfda9d60a499169acd7271734c12b3b08b08133451902cac7848a13c3bbc6b8603637bdd956 WHIRLPOOL a68619e06a9115e685591bfb5da55bc564d2f8b958ec78baba76d8703a68b54f30a30b5b98ea718fa5bfe4418c410d912be5790b23e46061b596779228863594
AUX calculate-core-3.2.0_alpha5-r2.patch 5506 SHA256 4c2ccc57ec1c8496b51c4a572e0a1d86982a75bb8c4e6ada329ff774de2af7eb SHA512 b2ee8ea8061c32cc0693c2124470db541544d98d2221f8b3606576bf039138d7fb3cff7bf15b0284cf1c1d7e3215d1e65ca3c027cffd47b65c99be76a3366a33 WHIRLPOOL 08722cd12ceed5646dfbddff70e80fd5fb4ce161e1284ddac206c40f43ac2a7176407ce0fa5acf8eadf91b5093a2d8e1cb034ffe5b536109015fa9fff311055f
DIST calculate-core-3.2.0_alpha1.tar.bz2 83658 SHA256 780a4107fcf2d6ee84be721e571f595ae8eb6cebf313cf6feef9c1d64d3a6575 SHA512 906a653de9286cd4d1d922937aa6afafef9a854ebf49f0636a4ad7e5e7ae136d353fe4b8c196c037688f8df7fd3df213800d184734193058df0ebb42090866d0 WHIRLPOOL ca8fe5f238111d78a65f2d42e8f3c169b7074cd5ebd7b8a653824b23d59cdcbfbfc7146ab7d96cc34300a7d418a036729a8c7931fd020c993e97103440e90c4c
DIST calculate-core-3.2.0_alpha2.tar.bz2 84591 SHA256 bed467810d02c14ac9e501a0057b652b8e610960193cf3d64c6a78acc5eb5140 SHA512 e77bf6f102c02006d559b96ca51cdb84d25ba9a4b1170c61fbe5158f2539e91acab2ae857a940b030d5b37d430822aa5e2cfe1fbe903436e284d43a3eeec3e09 WHIRLPOOL b299b1a43dbd70fb68efb6ea21b8d8beeef63985b5e0a5deb66668a76e46b7c621af19bf442bbc6cbb289a05beb59e69e3e3464fa392d4c2da56307daa960c20
DIST calculate-core-3.2.0_alpha3.tar.bz2 84808 SHA256 271d4d5752e26f0e4d435b2cad825fbeedeb146418f42f387fcdfc4ead683a0d SHA512 7dbd5a693eebd5d931f3ec8a377c613a6fbaa757bb48cfa90921fd608ce311deac32dee48d619a05f8b24781551142ca1af4d5fc437bedea4d259eaafb0aa52f WHIRLPOOL 5a2ec89684cfcbdb9afdb860b97e331d39ec4bdae5234bdafe856e2d69aa9e1367a184cce8e98a5b68ee5c108d84f6eadaeb94dfb6bde793af0cbc9be5302139
@ -21,5 +22,6 @@ EBUILD calculate-core-3.2.0_alpha4-r4.ebuild 1271 SHA256 951eca9ef8a4e21138f1fe9
EBUILD calculate-core-3.2.0_alpha4-r5.ebuild 1271 SHA256 d00f9690196482e10cf788de17c51aaa6581d0040061a22862bd2227f19a0e59 SHA512 6cdc70d1a8aff46dbc2305c377f77fee09adde6612bf2ba01d8ca07a000487958610b7c4fd9e97426df0b81bf1f0eefb7a9277e32e4e6ca2a0eaaa044ed057b3 WHIRLPOOL de0d39e16202a6694c3b62d05ab00a56c3469dd44ce4866ee81dda13255107f0c1a59ac379d4cbcbc756ff601f3a29764ab75752b80ae32f7629d317004384a7
EBUILD calculate-core-3.2.0_alpha4.ebuild 1129 SHA256 5265cd458eaf572bcdc443d19fceaef043ed57855890f0a017810bbbc835523e SHA512 6265973cb9b86ad68d0c2fc6cffceb14e0713fe2b6140c4daff5d18b71286572996332bd6e6b3679238e6e12cedd76f2d0e0b65fd7e0394426bc39ae65bb8d07 WHIRLPOOL d3f62367e9277aae8123efc10a91f4d614568e365ebeceabc22a3782dbbb3711ea3e8686ec8864c2f2f2856a945c66e5125fbb20d1fd07c169d1925e49e7f99d
EBUILD calculate-core-3.2.0_alpha5-r1.ebuild 1271 SHA256 bb6ca565f27cfb89251a9f15fff25d7eb743bb93a3d3646268a0eb19fd85fd07 SHA512 50e812db4e005a1bc3482d89da6e7f6b7e8b60f0d9f97c29a0bc2a7ed4b073609d2cd023c532b9c92bb9f6de5415539e9960ca82344e7ed8e773aba1f95174f0 WHIRLPOOL 605c78863ae19609773e274cdd9c2e4ea0147d9d7b31f7e5cf7079a409c1d6d532a4d99d75a6ee54e79d9dc7f8c314dcca0129ee3f3702b1bc48a920630af0bc
EBUILD calculate-core-3.2.0_alpha5-r2.ebuild 1271 SHA256 0bf4b67c6d9a0dd9f182f8726d71cc97433a43b33dc179007836b0998248ce6a SHA512 031c14bdc101b6fc69057df83bfcf70c8aa1df5e27e93afcd96e07b0566dfde84790c1db9bbfe072b71fbef2abd94458da88e48dc95f1da9b367bed69c9e391b WHIRLPOOL 1c239566c0d8e515b76217d8397a180c2ee386596d28eadcf5e301298290798a5462fb39e29e73be38850612bc561f3ad83b1ccb955b7aab4d24caecedc8edf4
EBUILD calculate-core-3.2.0_alpha5.ebuild 1129 SHA256 c7a2a90ddd2749bd33904e2f3cb96d63ae944b41f562d69e17fbd317af0bec16 SHA512 4a0d7f79a3472db765b0057e74186680bfc6a20e55589d5cec3947f6a52e79db361b3eea22d1e67bd4f981efa3316ac79fcf2b577df97e1b1abaa0d619fbbab9 WHIRLPOOL 70cef0293a36be5fe9d25a52f8b29b4aca288b0fc334c59d39ef4627fbdd4b9773f62719f8f61081e203385ae6709febf98faa0004d98867843abab1f9010299
EBUILD calculate-core-3.2.9999.ebuild 656 SHA256 39383ebc527d7155b147355108ec0b069f7cad95d5fcabc33520f0fe1ee0b971 SHA512 e20a8dea6e20615baeb56069331cdc35a7c37a05afa125c7174c5082852242da446830940c962fd890bb6627d9f5cacf0848834b75bfb1a184a6acfef17f95f8 WHIRLPOOL 3e9f06bf7e2f99a46e3c681fa6f381b7b1883bb15e05c535a7acde55f9092418d0b71d95ce4b2906e8505ea73c4157620303e4e4e4e4de430f11bfd6214b4a88

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

@ -0,0 +1,133 @@
diff --git core/depricated.py core/depricated.py
new file mode 100644
index 0000000..f5d7b4e
--- /dev/null
+++ core/depricated.py
@@ -0,0 +1,17 @@
+#-*- coding: utf-8 -*-
+
+# Copyright 2011-2013 Calculate Ltd. http://www.calculate-linux.org
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+safetyWrapper = lambda *args, **kw: lambda f:f
diff --git core/server/clean.py core/server/clean.py
index 25cb323..44f7406 100644
--- core/server/clean.py
+++ core/server/clean.py
@@ -21,23 +21,19 @@ from calculate.core.datavars import DataVarsCore
from calculate.lib.cl_lang import setLocalTranslate
setLocalTranslate('cl_core3',sys.modules[__name__])
-# clear server files after restart
-def clean (SID_FILE, PID_FILE, SID_PID, SIDS_DIR, PIDS_DIR):
- if os.path.exists(SID_FILE):
- os.unlink(SID_FILE)
- if os.path.exists(PID_FILE):
- os.unlink(PID_FILE)
- if os.path.exists(SID_PID):
- os.unlink(SID_PID)
- if os.path.isdir(SIDS_DIR):
- for filename in glob.glob(os.path.join(SIDS_DIR, "*.sid")):
- os.unlink (filename)
- if os.path.exists(filename):
- print 'Not deleted file %s!!!' %filename
- if os.path.isdir(PIDS_DIR):
- for filename in glob.glob(os.path.join(PIDS_DIR, "*.pid")):
- os.unlink (filename)
+def clean(sid_file, pid_file, sid_pid, sids_dir, pids_dir):
+ """
+ Удалить все файлы сервера после перезапуска
+ """
+ for fn in (sid_file, pid_file, sid_pid):
+ if os.path.exists(fn):
+ os.unlink(fn)
+
+ for dn in (sids_dir, pids_dir):
+ if os.path.isdir(dn):
+ for filename in glob.glob(os.path.join(dn, "*.sid")):
+ os.unlink(filename)
class CoreWsdl:
# watch for process
diff --git core/server/func.py core/server/func.py
index 9fdee9b..3bde6e4 100644
--- core/server/func.py
+++ core/server/func.py
@@ -17,6 +17,7 @@
import pickle, random
import threading
import sys, os, re
+from os import path
import traceback
from traceback import print_exc
from api_types import ReturnProgress,ViewParams,Integer,ViewInfo
@@ -38,6 +39,7 @@ from calculate.core.server.api_types import ChoiceValue, Table, Option, Field, \
GroupField, ViewInfo, ViewParams
from calculate.lib.datavars import DataVars
from decorators import Dec
+from calculate.core.depricated import safetyWrapper
class CommonMethods:
def dispatchConf(self,filesApply=None):
diff --git core/server/replace_class.py core/server/replace_class.py
index aa83294..6e0da47 100644
--- core/server/replace_class.py
+++ core/server/replace_class.py
@@ -352,7 +352,7 @@ class replaceClass():
def _printOK(self):
self.terminal_print('\r')
- self.terminal_print.right(self.color_print.getconsolewidth()-7)
+ self.terminal_print.right(self.color_print.getconsolewidth()-6)
self.terminal_print.bold.foreground(TextState.Colors.BLUE)("[ ")
self.terminal_print.bold.foreground(TextState.Colors.GREEN)("ok")
self.terminal_print.bold.foreground(TextState.Colors.BLUE)(" ]")
@@ -360,7 +360,7 @@ class replaceClass():
def _printBAD(self):
self.terminal_print('\r')
- self.terminal_print.right(self.color_print.getconsolewidth()-7)
+ self.terminal_print.right(self.color_print.getconsolewidth()-6)
self.terminal_print.bold.foreground(TextState.Colors.BLUE)("[ ")
self.terminal_print.bold.foreground(TextState.Colors.RED)("!!")
self.terminal_print.bold.foreground(TextState.Colors.BLUE)(" ]")
@@ -368,7 +368,7 @@ class replaceClass():
def _printSkip(self):
self.terminal_print('\r')
- self.terminal_print.right(self.color_print.getconsolewidth()-9)
+ self.terminal_print.right(self.color_print.getconsolewidth()-8)
self.terminal_print.bold.foreground(TextState.Colors.BLUE)("[ ")
self.terminal_print.bold.foreground(TextState.Colors.YELLOW)("skip")
self.terminal_print.bold.foreground(TextState.Colors.BLUE)(" ]")
@@ -379,13 +379,12 @@ class replaceClass():
self.spinner.stop()
self.spinner = None
self.setProgress(100, progress_message)
- if self.progressbar and self.progressbar.finished:
- self.terminal_print.up(1).clear_line("")
- self.terminal_print.up(1)("")
- self.progressbar = None
-
- # если result - сообщение
if self.currentTaskMessage:
+ if self.progressbar and self.progressbar.finished:
+ self.terminal_print.up(1).clear_line("")
+ self.terminal_print.up(1)("")
+ self.progressbar = None
+
self.displayResult(result)
self.currentTaskMessage = ""

@ -7,6 +7,7 @@ AUX calculate-update-3.2.0_alpha4-r3.patch 6988 SHA256 148483a99fa374a3f0e75fbc9
AUX calculate-update-3.2.0_alpha4-r4.patch 19180 SHA256 7e01cd3e5c02f7490fc11f301f8a5a2dd52ea6901918dab580429139ac9ea024 SHA512 72ceb57d48e9ca17646fef56f785adbe929007664d569b8c27e15dd4433a7dbc94e8942a18af333bb8a319fe50d2c4329c2c8fdebd0c9774923fcba9df694aa0 WHIRLPOOL ef0d5bf3161a4450a5f240ddeef502fab0bdb605d1f8d3852f99dfd8db893e74d5ba000252adb1af398609b421c22d6a37e76719d43dd8bda79f5c5535eb879b
AUX calculate-update-3.2.0_alpha5-r1.patch 488 SHA256 dc3ef84b48f1b4d9ff57263c4d6f45f0b3752f79b0afc8feb8a527cc16e1a5a9 SHA512 0bd80a9e2d9b54a0f5f11809a85645c22afc2094086004a7375212e5edde089799fab3e5bcd250a0609725741d0ecc3c6c90a83940161a924011d217ae3c5ff1 WHIRLPOOL 0d78cb993d7567629a819d08042ffcfd1f7a3e66e0532fcb717b48f29a73d7132e73fbebfbaef646125ded98ea2ac035309a49b5f45af3a72a4e59008351e183
AUX calculate-update-3.2.0_alpha5-r2.patch 2649 SHA256 537d81d1352453f0f11fca1fa3558b11c4bca96167e97ace04bfab1689133bdb SHA512 fde7a804943ff48765746b6d5fd1960850c717ce2289c43568af84cfe3d9934d4a7c0f1d92c469b99bcfff478297dbd2716353e93fd1d1e25939d1ca6a9e6723 WHIRLPOOL 17cccb453c8e3ff3d42548c02b5ddf849a9bfd456db7e68773bb10235dccb235a0e74125b7b95946146d5fe103010cb7b10180328bf582c314965e0ca40e9bc6
AUX calculate-update-3.2.0_alpha5-r3.patch 6639 SHA256 2b8630488a45370248538436d67ba948f4b36921192cebd8d83ef2666b2df5b6 SHA512 5e432a94fcf96e2456cc5935d66fab10befb51961b1a44d61a91e3f339723dc269cd48b8e1635d4574c12bcf9061e66d28df13b180a1b20147edb1091fc22061 WHIRLPOOL 271e1597ac7f82f6887e1eff30a68659662288d742ad97b56ee14afe96a23078fffbe38a2ceeee63c09dfde6c922f7e96d3bd333139b4bf7914a982f7c6eeb0c
DIST calculate-update-3.2.0_alpha1.tar.bz2 14159 SHA256 6c5e73041029e93f04fe897447984c1f52f66f3486309d4e3bb741c0151dc44d SHA512 aac77b42e51f3be5f266bc3a7c233d2fa443b6316a7a618c61ef07be8e25704322bec6c39352184ee8fae227e4b2bbf276dfa038d4006be12079c71e983d16d4 WHIRLPOOL 8f395718c3332286ce47783fc42601f3dea9b9f7fd7225e5549ff8d04013a4d6a2208f103fde112b6ebf6791650a61aa5974dbfa435aecfd7d8e7b2d7ff9ae8b
DIST calculate-update-3.2.0_alpha2.tar.bz2 24294 SHA256 b626f371db8def2823f5f2a5081122a0746a9dae5f04bb1e38bc82c618d69042 SHA512 32e216097ad19444b16200082a8796a6a7a2d824310e271df51e931e73eef1b13a57cbe9b6eaeddd6bf4e8b0e3a3d3f4a41def509ed1c55a960a3df524afd472 WHIRLPOOL 7b241545ce18af117481a813b2b0b2d9450f0b638068867fc60d2a759f4345d50114459646f51f6972267586678149efc5f4c26f1090d8f1fa4485b3bc4b4d5f
DIST calculate-update-3.2.0_alpha3.tar.bz2 24313 SHA256 934f4b55f9df42090a128c524e2874b27f2e91b7f5b9c0eb2170ad8ee899362e SHA512 31c593b8d70592aa5f05011583317054c7bb75f558ae792cc3289820eaa87d85f4be91e29485c2aa824d1f2d7cbde942ed7f66fd9937d8950e59d83d41f6f7a2 WHIRLPOOL b995a3806cf7c964a26d979ad6c1416ec4b7315e79546c079c72c0ee12eb7dcc589198149186aba65ab860736389bfd9f0c3b534d88c97769d0ece5d8f013c1a
@ -25,5 +26,6 @@ EBUILD calculate-update-3.2.0_alpha4-r4.ebuild 767 SHA256 8e9a3d77977a81cc529baa
EBUILD calculate-update-3.2.0_alpha4.ebuild 623 SHA256 51f176a0b12ff53b612634c391e3504059bb8f5bfba20325e86efda1cd0f2787 SHA512 f693242808a683f9bfb895dd4a5330b9bb50a27d51ab51a272619724a03ad5a531cc23434abbaae6773f974dc5d699f1aee7d9062d2b19076335ccbe4bd7febd WHIRLPOOL 39ce52a3ae9fe1f7bca4b00a96929a58cb50cdd9c0a22f801bd9b8fdafbece62f9033c48f9e3a549136d4b838f4ace423710cbd63e2e3b7da9fa72fa81802255
EBUILD calculate-update-3.2.0_alpha5-r1.ebuild 767 SHA256 fe240b29d75a1e24f3d0260d2556687dd1a86b208b717999a7d31b2b834140e4 SHA512 46cf6287a4021421c75b2cd8852499bb6f0a31f3f02fe9a950d6f2e16a660669501a4c46f79bfb96bf1540b3be20f416c6b42a5159db761c8d628e4294da2535 WHIRLPOOL 466fdb29dfad3fffb4e377fa58fc5f5b0bb074571c38fb58f008f1971909b8ce30578ec53b32e4160b6a59256cd8acb3c80cc46eb34a5d8e899a272486fe3858
EBUILD calculate-update-3.2.0_alpha5-r2.ebuild 767 SHA256 03ddecb52d21af5d8c2a5dd8b96ad87d1fead18a2630bd68f419f8ed3f0af7e7 SHA512 c2d80544c91bdf470b039a0dc81439a4b721977b281c80e411e2883ee73965f68b2bf4d75140e30c975271cd37d310d6df4bc2f585ff3632f687ccd4c6746d4a WHIRLPOOL fd87d40c1b44aa1ecef848f1c34a40bf8ba6603c3ce51716c1446000ed3f96a15421ddeb312943c6d21dbaeef39d5bc6983ebb58218d2de62e58a9a24c5c2e1b
EBUILD calculate-update-3.2.0_alpha5-r3.ebuild 767 SHA256 693bf06a78e2d02be968a1b807210b0f3d338f73f8a2aff9494ab42a71b36f08 SHA512 cd39e67a44c35477000136a05dec4d5721d71aa66d64438b450ac95a79ca03ce5dfb02c9110290cfe63256dfec1f24e68f1d78b6471d08125b870976b7616ec6 WHIRLPOOL bbaee8a3ae2db30bb1733ead92a888a79da888556b5cd9ea3cbf7db44dc4868daacac7daac66355c68f3f9446aa460bc282944ac08245bc6c83210b38e7c702d
EBUILD calculate-update-3.2.0_alpha5.ebuild 623 SHA256 b5b09dcf5177124e9e521154ab3e7e63e0052fc58dfeec1cacb6462f96112a3b SHA512 57c022bf4951fc6d341eb8df33d527a7f5d16f629b3ca1cd71710947eac3499fc0604f34ec666193a8222d6347914fdd38363364827d01db6c8e16af6b0c2a01 WHIRLPOOL 470fad0fdc631d4bcb52e370e3351adde95df42a56f23875945cf72c9e23fee0b8adad26ad592d5b9d17f6eed056bbfcafa3086f549aea6ef5f3e8e5fd7f027b
EBUILD calculate-update-3.2.9999.ebuild 530 SHA256 9558d49a6b95f73c67f79c835e4003725ba7ae7e0492ea336737da16fe2f5005 SHA512 466bce621f4073bfbf4d34063cbb54077910baa5e40637d5d8d23044edccc9d79bb764db25e05b68969f1bd63573a1c0bc04676f45a6bbeca173503df6887767 WHIRLPOOL 0107e9b7746739a9be77664aa9e6907c9e511ac0422721d709fe63ffb4a55246a2d6c494280bd3b72e50d8e1aecb7f811cfdd112c482168bd9fa17c4ff0d5eaf

@ -0,0 +1,33 @@
# 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 update Calculate Linux"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE=""
DEPEND="~sys-apps/calculate-core-3.2.0_alpha5
~sys-apps/calculate-install-3.2.0_alpha5
dev-python/pexpect"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-update-3.2.0_alpha5-r3.patch"
}

@ -0,0 +1,153 @@
diff --git update/emerge_parser.py update/emerge_parser.py
index 597ba55..204e758 100644
--- update/emerge_parser.py
+++ update/emerge_parser.py
@@ -57,7 +57,8 @@ class CommandExecutor(object):
def __init__(self, cmd, params, env=None, cwd=None, logfile=None):
self.cwd = cwd
- self.env = env
+ self.env = env or dict(os.environ)
+ self.env.update({'EINFO_QUIET':'NO'})
self.cmd = cmd
self.params = params
self.child = None
diff --git update/update.py update/update.py
index ce66dd7..8e082fa 100644
--- update/update.py
+++ update/update.py
@@ -16,6 +16,7 @@
import sys
from os import path
+import os
from calculate.lib.utils.tools import AddonError
from calculate.lib.utils.colortext.palette import TextState
@@ -96,10 +97,6 @@ class Update:
needMeta = True
if needMeta:
dv.Set('cl_update_outdate_set', 'on', force=True)
- layman = Layman(dv.Get('cl_update_layman_installed'),
- dv.Get('cl_update_layman_make'))
- if name != "portage":
- layman.add(name, url, rpath)
return True
def syncRepositories(self, repname, clean_on_error=True):
@@ -124,15 +121,26 @@ class Update:
if e.addon:
self.printWARNING(str(e.addon))
self.printWARNING(str(e))
- self.printWARNING(_("Re-fetch {name} repository"
- ).format(name=repname))
+ self.printWARNING(
+ _("Re-fetch {name} repository").format(name=repname))
try:
+ rpath_new = "%s_new" % rpath
+ self._syncRepository(repname, url, rpath_new, revision,
+ branch)
removeDir(rpath)
- except OSError as e:
+ os.rename(rpath_new, rpath)
+ except OSError:
raise UpdateError(_("Permission denied to change "
"{repname} repository").format(
repname=repname))
- self._syncRepository(repname, url, rpath, revision, branch)
+ else:
+ if not self._syncRepository(repname, url, rpath, revision, branch):
+ return "skip"
+
+ layman = Layman(dv.Get('cl_update_layman_installed'),
+ dv.Get('cl_update_layman_make'))
+ if repname != "portage":
+ layman.add(repname, url, rpath)
return True
def syncLaymanRepository(self, repname):
@@ -352,13 +360,12 @@ class Update:
"""
# подробный список пакетов
_print = self.color_print
- highlight = TextState.Colors.WHITE
if self.clVars.Get('cl_verbose_set') == 'on':
self.printPre(str(emerge.install_packages))
else:
pkglist = emerge.install_packages.list
self.printSUCCESS(_print(
- _("List packages for installation")))
+ _("Listing packages for installation")))
self._display_pretty_package_list(pkglist)
if emerge.install_packages.remove_list:
self.printSUCCESS(_print(
@@ -367,8 +374,7 @@ class Update:
emerge.install_packages.remove_list, remove_list=True)
if str(emerge.download_size) != "0 kB":
self.printSUCCESS(_("{size} will be downloaded").format(
- size=_print.foreground(highlight)(
- str(emerge.download_size))))
+ size=str(emerge.download_size)))
def _display_remove_list(self, emerge):
"""
diff --git update/utils/cl_update.py update/utils/cl_update.py
index 033a3bd..533d1c1 100644
--- update/utils/cl_update.py
+++ update/utils/cl_update.py
@@ -102,7 +102,8 @@ class ClUpdateAction(Action):
'condition': need_upgrade('dev-lang/python$')
},
{'name': 'update:python_updater',
- 'message': __('Updating Python modules'),
+ 'message': __('Find & rebuild packages broken due '
+ 'to a Python upgrade'),
'method': 'Update.emergelike("python-updater")',
'condition': was_installed('dev-lang/python$',
log_names['python_updater']),
@@ -112,7 +113,7 @@ class ClUpdateAction(Action):
]
},
{'name': 'update:update_perl',
- 'group': __("Updating perl"),
+ 'group': __("Updating Perl"),
'tasks': [
{'name': 'update:update_perl_pkg',
'message': __('Updating {0}').format(pkg_color('dev-lang/perl')),
@@ -120,7 +121,8 @@ class ClUpdateAction(Action):
'condition': need_upgrade('dev-lang/perl$')
},
{'name': 'update:perl_cleaner',
- 'message': __('Updating Perl modules'),
+ 'message': __('Find & rebuild packages and Perl header files '
+ 'broken due to a perl upgrade'),
'method': 'Update.emergelike("perl-cleaner", "all")',
'condition': was_installed('dev-lang/perl$',
log_names['perl_cleaner']),
@@ -133,15 +135,14 @@ class ClUpdateAction(Action):
'group': __("Updating Calculate Utilities"),
'tasks': [
{'name': 'update:update_calculate_pkgs',
- 'message': __("Updating {0}").format(
- pkg_color("sys-apps/calculate-utilities")),
+ 'message': __("Calculating dependencies"),
'method': 'Update.emerge("-u","sys-apps/calculate-utilities")',
'condition': need_upgrade('sys-apps/calculate-utilities$')
},
]
},
{'name': 'update:update_world',
- 'group': __("Updating packages"),
+ 'group': __("Updating the list packages"),
'tasks': [
{'name': 'update:update_world',
'message': __("Calculating dependencies"),
@@ -153,7 +154,7 @@ class ClUpdateAction(Action):
'group': __("Cleaning system from needless packages"),
'tasks': [
{'name': 'update_other:update_depclean',
- 'message': __("Emerge depclean"),
+ 'message': __("Calculating dependencies"),
'method': 'Update.depclean()',
'condition': was_installed('.*', log_names['depclean']),
'decoration': 'Update.update_task("%s")' % log_names['depclean']

@ -16,5 +16,6 @@ EBUILD calculate-utilities-3.2.0_alpha5-r1.ebuild 818 SHA256 b883f1bb51b945221b8
EBUILD calculate-utilities-3.2.0_alpha5-r2.ebuild 821 SHA256 181d9ecd6cc94acd0287d4d912df779c8ca89a4b7b85c8fc3db27237bc5c5e54 SHA512 9da3679e299542655f3cdc4df8f2ad3ac6c58cc5a26d96a858e5d977faf1f1a533bacc9b1b5f361cd6a4f15e811e5efb831522c3738b76743c98ce88671b1778 WHIRLPOOL f5f4b74b6eb8d558ea1a02310776c5a7e4568b043e437e992a6f429546167ca98a4d7e5a06dd42d322b7500fe2086601dbceef6fe48af5ea637d2aa3f1af473f
EBUILD calculate-utilities-3.2.0_alpha5-r3.ebuild 821 SHA256 c0965deeb8bfeed1af83ab921fbd9358c18fa17ff641db34d37cb24d3978849e SHA512 f2e81ddc3c0d4fe55c4a441aff135633bb91b02cd2c7da4ec40c87bb733afc2a7b98b833ddc72413440dc9938494ad0baf86ca22bb706861b00e32f6a8d3f99e WHIRLPOOL e46b717982cd526c85fc4c9ae9f16fa23fb819a07cbf75b988801b83d6522064def9ef2682b7d9d2dadc8b0da603dc246b680aecad1f197963b303145f11452d
EBUILD calculate-utilities-3.2.0_alpha5-r4.ebuild 824 SHA256 f1eab1bb8ad2f7b267e743cba39e4e183814ef0f96c7b72136aa9bd9e3961247 SHA512 48c8a7777ca47cde51f8a9accef7b1b35aa971be612582889f80c712dc079c1a0bdd0c63749b35457cb722de1e6cc47f8595c87a595cce4b26ddc5e01aaf241f WHIRLPOOL cfac6cee9308f941feea1f2f65d2d4665fcf2e7c80749d352a9507d79e5631551803c02dec6be8e43cca117d6bbddeb681743fdce2f8891c67e00f2b7dd42a34
EBUILD calculate-utilities-3.2.0_alpha5-r5.ebuild 824 SHA256 8e5e3fe8b0d4fc0036663d6f7c502509cfbf77ce456b4288ca8f7de6232f66e9 SHA512 27bb630f3c93a00838f01402a7c36cb2e126bc79a0e91b7c38116915f70388fc5aa8cf37dcfedd0142aeff3beb74929b3f010e4d0c0b49bf494ad9ca42bb8963 WHIRLPOOL f339925adc1067f7fd68898dbf9a9c356192140ce24d2497c347714e0d9fdf1dbf5cc536b26377b65e07dd2a5c7bc53d88aa69ce35d896b0be703d2a6c8344a2
EBUILD calculate-utilities-3.2.0_alpha5.ebuild 812 SHA256 63daca77ef430fde9004129bc823f23db03d55d1da05f06a6956d5492658cefa SHA512 0dd86877552a553982a5693f5bc47606b66f15974693cb6525dd8d61a4d6e4f8d27cb7dfda19b567329deec1515095f79c7ef55dfa0d4eef87d90c9d5b9b1db3 WHIRLPOOL 2cf662e15e5a0be84ccf5f3a32ccd87e56bd07bdff938bb188c0097a7fd1a88252799e5974019c0175bb1d04b374d5b78e444d69371dc8b5655e85e858bb5690
EBUILD calculate-utilities-3.2.9999.ebuild 800 SHA256 acbb7a4e34387baa1ade9bf97637972fbfc97afa56367381d622198b5237e983 SHA512 9e0c74eb499157b6d3ace20d7e9da630660e46b74a6d575e222e1638c87f85660635187489b9312a45f193780c301d87c1dbb9a0f60414e178e8f54080c71ffd WHIRLPOOL 9b56f590f36d29d3518c66c453f97b14d083e36b62adb70a8916ae4e30b527431602a9edd40d703e5cb4296a01f8c982157b602651ee57a9c0ddb7a4c6aa2fe1

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