parent
bf0c8bbc8b
commit
781446b084
@ -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
|
||||
http://mirror.yandex.ru/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The utilities for assembling tasks of Calculate Linux"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
RDEPEND=">=sys-apps/calculate-lib-3.2.0_beta2"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${RDEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-i18n-3.2.0_beta2-r2.patch"
|
||||
}
|
@ -0,0 +1,28 @@
|
||||
diff --git ru/cl_update3.po ru/cl_update3.po
|
||||
index 49ec85c..27eefc2 100644
|
||||
--- ru/cl_update3.po
|
||||
+++ ru/cl_update3.po
|
||||
@@ -496,20 +496,14 @@ msgstr "Интервал проверки обновлений"
|
||||
msgid "set interval for the updates checking"
|
||||
msgstr "установить интервал для проверки обновлений"
|
||||
|
||||
-msgid "hourly"
|
||||
-msgstr "каждый час"
|
||||
-
|
||||
-msgid "every three hours"
|
||||
-msgstr "каждый три часа"
|
||||
-
|
||||
msgid "every six hours"
|
||||
-msgstr "каждые шесть часов"
|
||||
+msgstr "раз в шесть часов"
|
||||
|
||||
msgid "every twenty hours"
|
||||
-msgstr "каждый двенадцать часов"
|
||||
+msgstr "раз в двенадцать часов"
|
||||
|
||||
msgid "daily"
|
||||
-msgstr "каждый день"
|
||||
+msgstr "раз в сутки"
|
||||
|
||||
msgid "Consider auto-check schedule"
|
||||
msgstr "Учитывать график автопроверки"
|
@ -0,0 +1,39 @@
|
||||
# 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
|
||||
http://mirror.yandex.ru/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_beta2
|
||||
~sys-apps/calculate-install-3.2.0_beta2
|
||||
dev-python/pexpect"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
pkg_preinst() {
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-update
|
||||
dosym /usr/sbin/cl-core /usr/sbin/cl-update-profile
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-update-3.2.0_beta2-r2.patch"
|
||||
}
|
@ -0,0 +1,122 @@
|
||||
diff --git update/update.py update/update.py
|
||||
index 17f64c4..b1eda94 100644
|
||||
--- update/update.py
|
||||
+++ update/update.py
|
||||
@@ -706,13 +706,34 @@ class Update:
|
||||
Выполнить очистку системы от лишних пакетов
|
||||
"""
|
||||
deo = self.clVars.Get('cl_emerge_default_opts')
|
||||
- with EmergeParser(EmergeCommand(["--depclean"],
|
||||
- emerge_default_opts=deo)) as emerge:
|
||||
+ emerge = None
|
||||
+ try:
|
||||
+ emerge = EmergeParser(EmergeCommand(["--depclean"],
|
||||
+ emerge_default_opts=deo))
|
||||
try:
|
||||
emerge.question.action = lambda x: False
|
||||
emerge.run()
|
||||
if not emerge.uninstall_packages.list:
|
||||
return True
|
||||
+ kernel_pkg = self.clVars.Get('cl_update_kernel_pkg')
|
||||
+ if any(("%s-%s" % (x['CATEGORY/PN'], x['PVR'])) == kernel_pkg
|
||||
+ for x in emerge.uninstall_packages.list):
|
||||
+ pkglist = [
|
||||
+ "=%s-%s" % (x['CATEGORY/PN'], x['PVR']) for x in
|
||||
+ emerge.uninstall_packages.list
|
||||
+ if ("%s-%s" % (x['CATEGORY/PN'],
|
||||
+ x['PVR'])) != kernel_pkg]
|
||||
+ emerge.command.send('n\n')
|
||||
+ emerge.close()
|
||||
+ emerge = None
|
||||
+ if not pkglist:
|
||||
+ return True
|
||||
+ emerge = EmergeParser(
|
||||
+ EmergeCommand(pkglist,
|
||||
+ extra_params=["--unmerge", '--ask=y'],
|
||||
+ emerge_default_opts=deo))
|
||||
+ emerge.question.action = lambda x: False
|
||||
+ emerge.run()
|
||||
self._display_remove_list(emerge)
|
||||
except EmergeError:
|
||||
self.printPre(self._emerge_translate(emerge.prepare_error))
|
||||
@@ -721,6 +742,9 @@ class Update:
|
||||
_("Would you like to unmerge these packages?")) != 'yes'):
|
||||
return False
|
||||
self._startEmerging(emerge)
|
||||
+ finally:
|
||||
+ if emerge:
|
||||
+ emerge.close()
|
||||
return True
|
||||
|
||||
def update_task(self, task_name):
|
||||
diff --git update/variables/update.py update/variables/update.py
|
||||
index a0634ac..acb1668 100644
|
||||
--- update/variables/update.py
|
||||
+++ update/variables/update.py
|
||||
@@ -23,7 +23,7 @@ from calculate.lib.datavars import (Variable, VariableError,
|
||||
SimpleDataVars, DataVarsError)
|
||||
from calculate.lib.utils.portage import searchProfile
|
||||
from calculate.lib.utils.files import readLinesFile, readFile, makeDirectory, \
|
||||
- listDirectory
|
||||
+ listDirectory, process
|
||||
|
||||
from calculate.lib.cl_lang import setLocalTranslate
|
||||
from calculate.lib.utils.text import simplify_profiles
|
||||
@@ -901,9 +901,7 @@ class VariableClUpdateAutocheckInterval(Variable):
|
||||
self.help = _("set interval for the updates checking")
|
||||
|
||||
def choice(self):
|
||||
- return [["1h",_("hourly")],
|
||||
- ["3h",_("every three hours")],
|
||||
- ["6h",_("every six hours")],
|
||||
+ return [["6h",_("every six hours")],
|
||||
["12h",_("every twenty hours")],
|
||||
["1d",_("daily")]]
|
||||
|
||||
@@ -920,3 +918,33 @@ class VariableClUpdateAutocheckScheduleSet(Variable):
|
||||
def init(self):
|
||||
self.label = _("Consider auto-check schedule")
|
||||
self.help = "consider auto-check schedule"
|
||||
+
|
||||
+class VariableClUpdateKernelVersion(ReadonlyVariable):
|
||||
+ """
|
||||
+ Текущая версия ядра
|
||||
+ """
|
||||
+ def get(self):
|
||||
+ return process('/bin/uname','-r').read().strip()
|
||||
+
|
||||
+class VariableClUpdateKernelSrcPath(ReadonlyVariable):
|
||||
+ """
|
||||
+ Каталог содержащий исходный код текущего ядра
|
||||
+ """
|
||||
+ def get(self):
|
||||
+ module_build_path = (
|
||||
+ "/lib/modules/%s/build" % self.Get('cl_update_kernel_version'))
|
||||
+ if path.exists(module_build_path):
|
||||
+ return os.readlink(module_build_path)
|
||||
+
|
||||
+class VariableClUpdateKernelPkg(ReadonlyVariable):
|
||||
+ """
|
||||
+ Пакет текущего ядра
|
||||
+ """
|
||||
+ def get(self):
|
||||
+ qfile = process('/usr/bin/qfile', '-vC',
|
||||
+ self.Get('cl_update_kernel_src_path'))
|
||||
+ if qfile.success():
|
||||
+ return qfile.read().partition(" ")[0]
|
||||
+ else:
|
||||
+ return ""
|
||||
+
|
||||
diff --git update/wsdl_update.py update/wsdl_update.py
|
||||
index 53af585..6f95581 100644
|
||||
--- update/wsdl_update.py
|
||||
+++ update/wsdl_update.py
|
||||
@@ -14,7 +14,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
-import sys, time, os
|
||||
+import sys
|
||||
|
||||
from calculate.lib.datavars import VariableError,DataVarsError,DataVars
|
||||
|
@ -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_beta2
|
||||
=sys-apps/calculate-i18n-3.2.0_beta2-r2
|
||||
=sys-apps/calculate-lib-3.2.0_beta2
|
||||
=sys-apps/calculate-core-3.2.0_beta2
|
||||
=sys-apps/calculate-update-3.2.0_beta2-r2
|
||||
cl_client? ( =sys-apps/calculate-client-3.2.0_beta2 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_beta2 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_beta2 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.2.0_beta2 )
|
||||
"
|
Loading…
Reference in new issue