parent
5c061848ca
commit
85aa0de713
@ -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
|
||||||
|
|
@ -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 = ""
|
||||||
|
|
@ -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']
|
@ -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…
Reference in new issue