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

atratsevskiy
Mike khiretskiy 11 years ago
parent 0076a716fc
commit bfbc5ba911

@ -19,6 +19,7 @@ AUX calculate-lib-3.1.7-r1.patch 1034 SHA256 9bca1fa0c02fa2d75c0e8d8ca1e86d9a92c
AUX calculate-lib-3.1.7-r2.patch 3241 SHA256 f211f0ac23cbc0af1debd6338988b255e04ba6544abc85557b1a27dbb47c038e SHA512 ca0bb9b95dd5594861c66ea19c94e788d53099801f251421f002637d2f15763bc9d1d9bf47272c49bd3b2fb75755520ae59a8ddf294c9c2293ab4187767dcf3e WHIRLPOOL 0c56fac55830460ef78a398d984217794658d1a33bb66665ddccc650b450a60695276ce0c054c60880dc0bdc0586afa5bee5a7a3893620f3cd612581b10723ef
AUX calculate-lib-3.1.7-r3.patch 5898 SHA256 4eefddb2ef84f8fb0286b01668f74ca050a7e645598f616e725600c16e5fefde SHA512 b884c4fedf15e830e106ea79edf4cb91084cca0ae15eff221e8568dcf49e08ed500e05181baf3baef66a02a15138dcdd00210ab6ad3447a6a3aeab0bbb7d5bba WHIRLPOOL c8167da016fd7df5f7a3c961d4b2b596025dc4441e4d782efdcb85d0acfa190d49f2459cfff5e35c7919b71717f2d089c67b6be3bbb42597b45cb3e61f3c77c6
AUX calculate-lib-3.1.7-r4.patch 5903 SHA256 511821da98b65d3e1278436f944f707877d4081216f61bc2da559d4adce92f3c SHA512 a29d89b0a549860f5b62d060381e562a4c00457da0a3171faa09f58030fb5de16de55c77e36a63c03bdadc887a99b701fa035517f6544c93bbc481f89de811c0 WHIRLPOOL 9b8d8cf384ba9ae1631280779bc097da0353ab6afe5528b1552fb2939207e9556b94ac6763a28952977eb8dec3cd84aab590191f1e85b5b80f411ae3a8d9cac5
AUX calculate-lib-3.1.7-r5.patch 11676 SHA256 acb8610e5ac2a5f9909dfb2273daf3a27879c7d5f121f19a97f3834420a020ff SHA512 b761bc25f3899614098528539a3e793bc2b944f590d13c0d6ebd5cd845b0a70eb8e763e183f9bfd3b0b5a43f6ae876a5109a741e5cb2f13993a64230189bb425 WHIRLPOOL 5e3f71fb222ab5e145b92521ef796bf76014be208678a21ff7a759c7571e727b951fe9e92f7226e129272d845b05e4c939512336010bccde42ebca5e24a28373
DIST calculate-lib-2.1.11.tar.bz2 61687 SHA256 62976c08d4fb4810389ace6f5a99abb5a962f6c8d9053ff943d0669480fb5599 SHA512 e3bc2168a55367cf19ad3a27921b53e5e845643238bf171209ab29752c91b5d4d338a2120774764ac1c79abd93f2deff8680f8faa1407940984ea9fd6a199e67 WHIRLPOOL 0ced92ea493dd8db02b0ae1514ebbb51ee76dc6f441b4a38c984c39da2121fb81dd1f2e840c4c5b71a117a12817a2a269d85676288202aa9801f69727e3338dc
DIST calculate-lib-2.2.31.tar.bz2 120044 SHA256 ba38052d8b2349a1c60adc589a74eb8a3ffcbf6f3c1124e4c1fb0da3aa777f12 SHA512 902871b9159f2bcf7a0cc767fb6df5b19902fce6cf9468d96f902c383a422738b65debe3094c92d1f82de2124936496f89631c6eb9670da00807b63156b101b7 WHIRLPOOL 5179ee691519f3a7faa3135d040ad64bd6d67c026ebf39bb17f7d641130a2b58641d1fe5da4f6cfbd45d4442d93508f0a5f641ef2cd8c43e1a322aab3d11f4b9
DIST calculate-lib-3.1.5.tar.bz2 121086 SHA256 3809b0e89c56414d488c931b279956562d6dc445ccbc385268e9881d495cec2b SHA512 9372dba87a96e79150bc26c43d49efbe90b4d1d9bf9f79b3a536663c0b621263333a792678f589a65335f230d60042254b1cdb5187760e2faac8f88b34eeb714 WHIRLPOOL f59751e50fcb0c0b95a91d0d5e45611a752dbe7b98a40289b8732a2fbb887bbfe83c5e63be4a81dd5be12ca715e32a1f4e6d50b62edd97a0f60fdd1e9da7595c
@ -43,6 +44,7 @@ EBUILD calculate-lib-3.1.7-r1.ebuild 824 SHA256 62a7a29f69d0ffed572118ae52001b5c
EBUILD calculate-lib-3.1.7-r2.ebuild 824 SHA256 63db02bd40925103f88cc7dd02b5d53814b3b725c9db7d40cb80c3ca33e4f59a SHA512 3407dd86bfd2d6fcc9af4b5d9b7a2b8a3618c41fb0fe2a5b3b244352d64853b8090dfc032ff3d5b065d9ae49e578b47de685532c1592d3f00ab183bbe401218e WHIRLPOOL 095ffcf98a7f72274debc1b06052a8104c9872180c9c9db56b3dbbc17571928ff66cabc219491d3e4d92e14f5227713219b9a2cfca3dfb9bdf6af1be2b4db68e
EBUILD calculate-lib-3.1.7-r3.ebuild 824 SHA256 01bba1e8ca7dea02d601d3f6232d228f36c32b9cb9c07cf0bcd17b65a5cd0d34 SHA512 83b3fd4006b117e0a3f4321d3d4df7277943f485580a664692b911f47438010d7b82ceb6cdf5520c375bb0d2ccb9e32dfc9aabdfd012b2e863f70dd15df19b4b WHIRLPOOL f7c7d2cec09ae9958e0cb615d40202486b54d949f5e107f829ee5140cbe9f535085ddd0b7592e0747884ad3c4791a85980462f826d5b31642e128ae8bed0036d
EBUILD calculate-lib-3.1.7-r4.ebuild 824 SHA256 29ab35974462d03b5c17411ed3d331ab1a5120dd528252c410e7c05009221bc4 SHA512 31033b1b90f77467c120bb0fdeab4adbad78869113cafd629e640024cf302405d7be2497e629840b77f76df925ed33a9312d2c68e18091eb3115afbfd60bb4b4 WHIRLPOOL 73b207a7815f6fcd809a1e270f60520c5b746152c319eaf7f028b818b02a7e01c12ef4181047570d476784f3bb16845a4885d2653b0100e5ea415edf73a69677
EBUILD calculate-lib-3.1.7-r5.ebuild 824 SHA256 f07b554b6752318e29d25a869f879705c39f1a722b7905c339533141fb6bcc3b SHA512 4414d6f7102ea4eb7155f1ff05a5946822fdb172e519ada66c8c8e194a50c750294181f216b0dbbb4d789cbd00cce58783aa6b6eb28c2b0df8bd9d5692f9bb5a WHIRLPOOL f13c549bf92af895165af79fb0308c5718a35093ab1d9acca2937f1c9c1dc1ecc9d889c34e17616b41f917417024a51b717055d491d141f9902a2d9441eef591
EBUILD calculate-lib-3.1.7.ebuild 690 SHA256 c89c29f5de3f70146e98f15035366506933f03e8a5066b1ad55aeccbebdeae2c SHA512 a7277c2e5fa64a5e5840be7fc8d3df9a31f41926386c5fe6a9bed31eeed6321af5881c218d9ce7eeb12aee518edb682b438e10397dcb815cc63645100430e43e WHIRLPOOL 8f19e4d46381e26fec81e20fa35599f4658b3891d6372c921a8b1354ad3b1821ea9c78f71caebf54610e0b5aacfb6e6ded018e155e1979322406a0ac1e823d09
EBUILD calculate-lib-3.1.7_alpha3.ebuild 681 SHA256 6a6332013e5a56db775c6490b63b60f959528660b0982e6a414f1614c0b0ffa5 SHA512 19a71823543fe843a05a548207509ee4dcffa784c61e23c56cf17d2c651effbfc63914beb03f0977b804c5cc647407eecdcbdaed4d7478783bec46eee72a50fb WHIRLPOOL 5ffd414c804671057fe2a7a2176999eee0a75574a5043332d3c01f08b93635773800e6b5d9901993e4fbf7f95d175659d621be9231d08f8bdada2654e45f8e1d
EBUILD calculate-lib-3.1.9999.ebuild 708 SHA256 a1d64b7f014831bf6b0a38928d53cb55758b7a12e5f3e98fffd28025ffacbce1 SHA512 3873859a791941d421e2338b437521955da383ce986408f1a951305e2dd75a1a4f771c9ec2caa096c5c8ea6a1776d6d0ed99e025ffa786ba029cafdbadfa439b WHIRLPOOL 5ac1a10b53f810ab527a0ebe52bc87e8397e61375cf6e0acbed89d8f6b8385e72bf234e0fdce479c3a3f1652bb6e520710ce9356750a97d644c0db0a33f6facb

@ -0,0 +1,36 @@
# 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 library for Calculate 3"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="amd64 x86"
IUSE="minimal"
DEPEND="!minimal? ( dev-python/py-smbpasswd )
>=dev-python/pyxml-0.8
sys-apps/iproute2
sys-apps/pciutils
sys-fs/lvm2
sys-fs/mdadm
dev-python/pyinotify
sys-apps/file[python]"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-lib-3.1.7-r5.patch"
}

@ -0,0 +1,284 @@
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
index efda545..1eb5004 100644
--- calculate/lib/cl_template.py
+++ calculate/lib/cl_template.py
@@ -327,6 +327,8 @@ class _terms(_error, _shareTermsFunction):
else:
try:
valVars = self.objVar.Get(vals[0])
+ varTable = self.objVar.Get('cl_used_action')
+ varTable.append((vals[0],vals[1]))
if not valVars:
valVars = ""
except DataVarsError, e:
@@ -505,7 +507,8 @@ class fileHeader(_terms):
"""
# Допустимые параметры заголовка
- allowParam = ["format", "format_conf", "comment", "append", "force",
+ allowParam = ["format","dotall","multiline",
+ "comment", "append", "force",
"link", "mirror", "symbolic", "chmod", "chown", "name",
"path", "autoupdate","protected", "run","exec","merge",
"module","env"]
@@ -526,7 +529,8 @@ class fileHeader(_terms):
# условные операторы
terms = ('>', '<', '==', '!=', '>=', '<=')
# параметры без значения
- listParNotVal = ("symbolic", "force", "mirror", "autoupdate", "protected")
+ listParNotVal = ("multiline", "dotall", "symbolic", "force", "mirror",
+ "autoupdate", "protected")
# Результат вычисления условия в заголовке
headerTerm = True
@@ -5643,6 +5647,14 @@ gettext -d cl_template "$*"
elif objHeadOld and objHeadOld.execStr:
execStr = objHeadOld.execStr
+ if objHeadNew.fileType != 'patch':
+ wrongOpt = [x for x in ("multiline","dotall")
+ if objHeadNew.params.has_key(x)]
+ if wrongOpt:
+ self.setError(\
+ _("Option %s should be used for format=patch only")\
+ %wrongOpt[0])
+ return False
if objHeadNew.fileType:
formatTemplate = objHeadNew.fileType
typeAppendTemplate = objHeadNew.typeAppend
@@ -5654,6 +5666,11 @@ gettext -d cl_template "$*"
return False
# создаем объект формата шаблона
objTempl = self.getFormatObj(formatTemplate, self.textTemplate)
+ if formatTemplate == 'patch':
+ if objHeadNew.params.has_key("multiline"):
+ objTempl.setMultiline()
+ if objHeadNew.params.has_key("dotall"):
+ objTempl.setDotall()
if not objTempl:
self.setError(\
_("Incorrect header parameter format=%s "
diff --git calculate/lib/datavars.py calculate/lib/datavars.py
index c0ef821..7470f3c 100644
--- calculate/lib/datavars.py
+++ calculate/lib/datavars.py
@@ -398,6 +398,8 @@ class Variable:
return
if "choice" in self.type:
choiceVal = self.choice()
+ tipChoice = map(lambda x:'"%s"(%s)'%(x[1],x[0]) \
+ if type(x) in (list,tuple) else str(x), choiceVal)
if choiceVal and type(choiceVal[0]) in (tuple,list):
choiceVal = [x[0] for x in choiceVal]
if not "list-list" in self.type:
@@ -410,7 +412,7 @@ class Variable:
name = self.label or self.name
if not choiceVal:
self.raiseNothingValue()
- self.raiseWrongChoice(name,choiceVal,val,error)
+ self.raiseWrongChoice(name,tipChoice,val,error)
def raiseWrongChoice(self,name,choiceVal,value,error):
raise VariableError(error.format(
@@ -1543,6 +1545,19 @@ class DataVars(SimpleDataVars):
self.Check(var,self.Get(var))
else:
val = self.fixWsdlTableValue(varObj,val)
+ if varObj.type == "choice":
+ choicedata = self.ChoiceAndComments(var)
+ if any(choicedata):
+ choicedata = zip(*choicedata)
+ if not val in map(lambda x:x[0],choicedata):
+ result = filter(lambda x:val in x[0] or val in x[1],
+ choicedata)
+ if len(result) > 1:
+ raise VariableError(_("Ambigious choice:%s")%
+ ",".join(map(lambda x:'"%s"(%s)'%(x[1],x[0]),
+ result)))
+ elif result:
+ val = result[0][0]
self.Set(var,val)
# raise error for atempt set uncompatible variable
if uncomperr:
diff --git calculate/lib/format/patch.py calculate/lib/format/patch.py
index 4251c49..9c50bee 100644
--- calculate/lib/format/patch.py
+++ calculate/lib/format/patch.py
@@ -36,6 +36,7 @@ class patch(_error):
self.doc = self.textToXML()
if self.doc:
self.rootNode = self.doc.documentElement
+ self.reFlags = 0
def textToXML(self):
"""Создание из текста XML документа
@@ -51,6 +52,12 @@ class patch(_error):
return False
return self.doc
+ def setMultiline(self):
+ self.reFlags |= re.M
+
+ def setDotall(self):
+ self.reFlags |= re.S
+
def processingFile(self, textConfigFile, rootPath=None):
"""Обработка конфигурационного файла"""
if not self.doc:
@@ -89,7 +96,7 @@ class patch(_error):
%reText)
return False
try:
- regex = re.compile(reText)
+ regex = re.compile(reText,self.reFlags)
except:
self.setError(\
_("Incorrect text of template '<reg>%s</reg>'")\
diff --git calculate/lib/variables/X11.py calculate/lib/variables/X11.py
index 72de72b..ad33e27 100644
--- calculate/lib/variables/X11.py
+++ calculate/lib/variables/X11.py
@@ -18,7 +18,7 @@ import os
import re
from os import path
from calculate.lib.datavars import Variable,VariableError,ReadonlyVariable
-from calculate.lib.utils.files import process, readLinesFile
+from calculate.lib.utils.files import process, readLinesFile,FilesError
from calculate.lib.utils.common import (getAvailableVideo, getValueFromCmdLine,
getVideoFromXorgLog, getVideoFromXorgConf, getVideoFromCmdLine,
getCompositeFromXorgconf,getTupleVersion,
@@ -36,7 +36,7 @@ class VariableOsX11Resolution(Variable):
processXDpy = process('xdpyinfo')
if processXDpy.failed():
return ""
- except OSError:
+ except (FilesError,OSError) as e:
return ""
lines = processXDpy.readlines()
reRes = re.compile("dimensions:\s+(\d+)x(\d+)\s+pixels")
diff --git calculate/lib/variables/__init__.py calculate/lib/variables/__init__.py
index 1c1d90a..b703d5c 100644
--- calculate/lib/variables/__init__.py
+++ calculate/lib/variables/__init__.py
@@ -25,6 +25,7 @@ import linux
import net
import user
import system
+import action
from calculate.lib.cl_lang import setLocalTranslate
setLocalTranslate('cl_lib3',sys.modules[__name__])
diff --git calculate/lib/variables/action.py calculate/lib/variables/action.py
new file mode 100644
index 0000000..802aca9
--- /dev/null
+++ calculate/lib/variables/action.py
@@ -0,0 +1,59 @@
+#-*- coding: utf-8 -*-
+
+# Copyright 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.
+
+import os
+import sys
+from os import path
+from calculate.lib.datavars import (Variable,VariableError,ReadonlyVariable,
+ ActionVariable)
+
+from calculate.lib.cl_lang import setLocalTranslate
+from calculate.lib.cl_template import Template
+setLocalTranslate('cl_lib3',sys.modules[__name__])
+
+class VariableAcCustomName(Variable):
+ """
+ Пользовательское действие для выполнения шаблонов
+ """
+ opt = ["ac_custom_name"]
+ metavalue = "ACTION"
+ type = "choice"
+ value = ""
+ untrusted = True
+
+ def init(self):
+ self.label = _("Custom action")
+ self.help = _("custom action")
+
+ def choice(self):
+ oldAction = self.Get('cl_action')
+ oldName = self.Get('ac_custom_name')
+ clTempl = Template(self.parent, cltObj = False)
+ try:
+ clTempl.applyTemplates()
+ except:
+ pass
+ finally:
+ self.parent.Set('cl_action',oldAction,force=True)
+ self.parent.Set('ac_custom_name',oldName,force=True)
+ clTempl.closeFiles()
+ return list(set(map(lambda x:x[1],
+ filter(lambda x:x[0] == 'ac_custom_name',
+ self.Get('cl_used_action')))))
+
+ def check(self,value):
+ if value == '':
+ raise VariableError(_("Need to specify action name"))
diff --git calculate/lib/variables/env.py calculate/lib/variables/env.py
index 094afcd..6d376e5 100644
--- calculate/lib/variables/env.py
+++ calculate/lib/variables/env.py
@@ -204,12 +204,26 @@ class VariableClAutoupdateSet(Variable):
else:
return "off"
+class VariableClHumanEditSet(Variable):
+ """
+ Параметр для отметки "ручной правки"
+ """
+ type = "bool"
+ opt = ["--human-edit"]
+ value = "off"
+
+ def init(self):
+ self.help = _("mark as human modification")
+ self.label = _("Mark as human modification")
+
class VariableClProtectUseSet(ReadonlyVariable):
"""
Использовать portage интеграцию с конфигурационными файлами
"""
type = "bool"
- value = "on"
+
+ def get(self):
+ return "on" if self.Get('cl_human_edit_set') == 'off' else "off"
class VariableClDispatchConf(Variable):
"""
diff --git calculate/lib/variables/system.py calculate/lib/variables/system.py
index 08593ef..70bcf87 100644
--- calculate/lib/variables/system.py
+++ calculate/lib/variables/system.py
@@ -145,3 +145,12 @@ class VariableOsUefiSet(ReadonlyVariable):
return "on"
else:
return "off"
+
+class VariableClUsedAction(ReadonlyVariable):
+ """
+ Переменная содержит все найденные при обработке шаблонов
+ событийные переменные (ac_)
+ """
+ type = "table"
+ def get(self):
+ return []

@ -1,4 +1,5 @@
AUX calculate-update-3.1.7-r1.patch 1308 SHA256 83b2d39b191814a51aa8c0291ac79edfcbd78125181c78101f89f59f0a09f6ac SHA512 989ee4284fc766da4efb44febfceb45a014842f8abb2d3a1807ed9ed5db965f81004dfb289f0790845a5e20d65cb84e2f7f12050e9e9a5daf56c8bdef21141c1 WHIRLPOOL 6d4cb8faab8e09d20c2705f021c22c5c010b7880e5793cfa55f16dd0439bc3d46eb878a600d4dc4b5b600007f39f9c4cda206ba49fc2b3eb9945d4f5fcfd5a78
AUX calculate-update-3.1.7-r2.patch 1668 SHA256 60d65bad3d292e28af9f7acea2ff082384a5b9a95b5560963afd7db63531b869 SHA512 451848e9234d775e892f46ffd31842ab23a4571af38fea181bd703d2c0dd09d0af49c2141b33a547ea81c35feb3853f4876897b83f2b2e281b480aa972fc8488 WHIRLPOOL 66531c3b3be77a97fd2caedd3b58a0a7dd66a27abf3c5b849901b9c2366ce7c73699ad4e1f475d26416cfef1fc16fcc0425a810dc98b89dd52076e81ab8d02f8
DIST calculate-update-3.1.5.tar.bz2 6987 SHA256 c5f7d7e113a1eae1717797e9b94c40586b4c45123691b8a3a5c20b0a6e926200 SHA512 bb3b0f2b65e5f6e5c77ca8a80f9adf0379f4a992e50de0bb43be500aac4a727e2920e330e4ed292c2a553b1ef3fc50f615ce3122c3147c5661622a6642ac92b9 WHIRLPOOL 164db94c45bd51852e6db8672341406087390007c88e0a3d1f417cd7ab5124f250fcc9ef4e623956f7e1ee9f096f95c4e1df6ddcf0715852915d8be588c31687
DIST calculate-update-3.1.6.tar.bz2 7011 SHA256 052fe75d63f2b2b7ea269a6741a3faec2114e3a3dae9638d47919bdcbd20856f SHA512 8d0483d874b23f1f15bc87e19fa1a2aa552aa8b9d38f26531befce7a46c33cbcc119a5cd28d0f25c071473ede3299405f7875942ec984be8a6fa351916b74092 WHIRLPOOL 9ea493434c208691292909014d5591f7db3a9760816c6c6530ae1e6c0f73cf4d53d40ccb13e44f72b10dddd49bd02d27b5aa6873cd6584cb64dfa36b7f139c07
DIST calculate-update-3.1.7.tar.bz2 6672 SHA256 8d1867a6a21fb8bbe472a501d4d5ed996d43db3080646dc0ae7ce4631a8a9079 SHA512 dd6a581f8eb9abad6ecb7de3c3cb6f9642c8394a7ae2fd514c19db12e4914e2be0739c07ed3bfea1214f39efdb0ac7245cbd67c01a73a52ef3d293ad7eb737cb WHIRLPOOL 3af292d577d924a247f4b4ac7f788e36c5b29a18dae944ab6a99741eef9630135483d884768757052526158849b967848ac7683725edafe5de4464ffc0311392
@ -6,6 +7,7 @@ DIST calculate-update-3.1.7_alpha3.tar.bz2 6677 SHA256 ad4dfdce4b5410ba08b24eb30
EBUILD calculate-update-3.1.5.ebuild 589 SHA256 2b0825365ad96494a07704a7422b7978c7fe4cc3ac77c1dadfb1f71a23290b54 SHA512 98ebf303c495a184eba4ce66d67b4583e32c96187ae35e6f6be0a7e4b7824278fd26f322f44de3658e21439ee1f82f89b6d48647989a7e1160d6d33015c8b853 WHIRLPOOL 6902155ee5ddb983603eee5bfacac7ab9db471054309686067f0cd69440ed78f63a5699cf08015feb0d623c060c5a7e99a6d3e774cc7599098d63af51b168839
EBUILD calculate-update-3.1.6.ebuild 589 SHA256 67f1ee16563e3e6d7cb4449b408b3271fc8de380611bf3fb0bf01542260f61bc SHA512 7e465b25a6122a654431e032f414bc09ae1715bdd616db42e687c8de5a089d1b087fc02b0946aeefb13de267d3fb8e6ce037b1c0b3fc0f2b92e2d882309890ba WHIRLPOOL 3f82cf3a0e058cd0ec2b34b65be74c7c1a13e918fff7e449d612f6994b70a6466a6b696c451721a5abf658409143aada776cb82b9bf2a3bfbc2f15ace68be5e6
EBUILD calculate-update-3.1.7-r1.ebuild 726 SHA256 2cc08ae430f5c96851d6aeb84b476d874c808d56e1f7eb4dffdd9691bd7b1042 SHA512 808d20fa7ef5054312641721af59cdea7d9289a30c01158350dc949599846d3d82af841e60a0e6eb27ba26eee08b5db5a26341395856ae8293d8c004d06845a8 WHIRLPOOL 2ea4a8a50dbfb64ddaee9235b8215490c28d106bc94a6fcdbbe417c6fba861c92a16b11a3ea07c1ed8c02bfeeddb9da99cbb56c6da758fc85063289628cbd251
EBUILD calculate-update-3.1.7-r2.ebuild 726 SHA256 ff378011aa3498503ec480eddbce202dde9ae175b86969b59b09d19919ec71ff SHA512 a29fbf2512b7cf2eeabb1b32195f6ffee24e0643090484169cf4eb4bedfcd89ebd6c1ab1fb17622f0f0a48e1dafea6497f68f9dd1d25bd42bbbda03927890ade WHIRLPOOL 96b0c085a45f462b5dac569cdd6faa0e53b43e8393309213e09cb8a46823cc8de0c577061af357523bf089e3212523e2538f92f26b863625d2c54cf5419becc6
EBUILD calculate-update-3.1.7.ebuild 589 SHA256 0b2b47388c2cf222f6a58331de513e08179f1d5afaf54250b0849c2954da3d78 SHA512 ad1780d67c6f82521e63697cb9a537f733cbc2f96b5e7eb7097c4ec50657452634473a827b8913ba478259f7c4137933b6c7c3b728f391fa6caaf2c624ec9b96 WHIRLPOOL 96b3f7c586323d27405dc11d8cd22ffb2c35eb8ae18e44be78d7f4de28fc327e72dc316f5c895a53c94ab25c476c68234c17b5dc30f857f536c39645d416a08d
EBUILD calculate-update-3.1.7_alpha3.ebuild 594 SHA256 3dc53330f5596f572a69415f1709ee2d30738ab1ed1a95f51f24f74f400eb576 SHA512 e83780cfc8501070502357d65ed07dcd8caf2ef1bdf42c21e1eb7ebc1545c0e73fce3d40d8b579a3da66eb951785a8c79b88a1e957fb687c81ef778303aa6e9f WHIRLPOOL 5242d9a101f0ce189c66b3e258f71388df1a32e49a1597e7f9c5299cea23814c1b02407f16b79f8bcab15cb73da49432c2d366a523d1a397b67e8ab38c099208
EBUILD calculate-update-3.1.9999.ebuild 530 SHA256 f014911ae52c1eadd9615ab1a2c930eb79aab49f509260bd6573eb3985ce2ec8 SHA512 3523efdb19b9646a0d1dba6d6a4664393d07f9aa666392d355b4596cb1bca8cd80a62bbd7f6db7029c1173ebb2a16e9cf168cea1d7f2c051ba8838c86c234454 WHIRLPOOL a394a23a0277b40cc2e7242b08750638434c3b6bf0f340fec923f90e738618b1cc0e223e327484f95d24f7637e8bebec6dff4b6385b731376f6f8cc8897caf79

@ -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="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.1.7
~sys-apps/calculate-install-3.1.7"
RDEPEND="${DEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-update-3.1.7-r2.patch"
}

@ -0,0 +1,38 @@
diff --git update/utils/cl_update.py update/utils/cl_update.py
index 3b058e9..9b84550 100644
--- update/utils/cl_update.py
+++ update/utils/cl_update.py
@@ -31,7 +31,7 @@ class ClUpdateAction(Action):
# ошибки, которые отображаются без подробностей
native_error = (FilesError,)
- successMessage = __("Revision update finished!")
+ successMessage = None
failedMessage = __("Failed to update of system revision")
interruptMessage = __("Update manually interrupted")
@@ -40,4 +40,14 @@ class ClUpdateAction(Action):
{'name':'dispatch',
'method':'Install.applyTemplates(install.cl_source,cl_template_clt_set,'\
'True,None)',
+ },
+ # сообщение удачного завершения при обновлении ревизии
+ {'name':'success_rev',
+ 'message' : __("Revision update finished!"),
+ 'condition':lambda Get:Get('cl_update_rev_set') == 'on'
+ },
+ # сообщение удачного завершения при пересоздании world
+ {'name':'success_world',
+ 'message' : __("World rebuilding finished!"),
+ 'condition':lambda Get:Get('cl_rebuild_world_set') == 'on'
}]
diff --git update/variables/action.py update/variables/action.py
index 2db4304..8e2de8e 100644
--- update/variables/action.py
+++ update/variables/action.py
@@ -31,4 +31,4 @@ class VariableAcUpdateSync(ReadonlyVariable):
action = self.Get("cl_action")
if action in ("sync",):
return "on"
- return ""
+ return "off"

@ -29,6 +29,7 @@ EBUILD calculate-utilities-3.1.7-r15.ebuild 767 SHA256 996d412e0ec78e3a9cbacd74d
EBUILD calculate-utilities-3.1.7-r16.ebuild 767 SHA256 355f238ea3e89c16c19e02cc0f82365ec3295af42892aa072af3afa761550bbe SHA512 564701371c3d5ca665def399c1791e02ee8bad76bb8619d5a49fb73dff1a84ddaefbdd338578914581b93e71d9cab971dc2330578fca78876ccabadf8930235e WHIRLPOOL 5ee88c5044574b52f5baf58d23fb80256b82b887c9e4fcca723c0c4e292407cdefb9704b1e2e01eac1ccbe0f1df1f0f1fc0b3606d81593ed0480a9b2b7596263
EBUILD calculate-utilities-3.1.7-r17.ebuild 768 SHA256 8b76a29c93af83622266ef3471a01932121149298448711a88090c3dad2ccddb SHA512 3cf7e1475bcc91f889284461865cdbe9a7557c45044c5711ed65128807830de80e03b235337e3d877da8862f21e2e65ff3539c89f4ec9cc7caad98f26332c66b WHIRLPOOL ad685df21d38a036f7e3be905182692d9bec27824a2ef246773b9fda6160acf779fb027018576b3559dba0f30060a78e317da68b2e999540c2373ba9239471f7
EBUILD calculate-utilities-3.1.7-r18.ebuild 771 SHA256 64be0145fa49abd9866f4614357dbbb3dca2b2c057f9998b2744fdcf7092386c SHA512 5bc6318854c84dbb0e5a417527399afbefbdc78cb926407117da1c2b3d28ffbb8aaa50d8820760d79084b1f88d1756159cfa5285f14f9c922a7161bb85425e13 WHIRLPOOL cf4e117f1c9d4e07bca4266411b0c261aaf6744b8bdffa631fdef354df255d76f331cfa30882eef83dc2b79655a6c2515a4837f0352d3486c6512fd6c28513f3
EBUILD calculate-utilities-3.1.7-r19.ebuild 771 SHA256 fb8e25c76a15bff3a300657b354bfba7142799d7aad5c73cb2c768d0c6cb26d8 SHA512 7f3eb1e7a5930af68e9a2c84eef7aa0baad624e1294103f0ee81a09808fcfc44150ea7127332e52c055a9e42b9acfa917783085eb89e5192e0a482561c7f60a0 WHIRLPOOL e22b9f9c776617ff6545d687e14a6e36ca21d1f3a864a1c8c3b511c6d34a7fca470343e7bed6580210a3791c7042ed9c762d34943a9f61a4b01bb88819fc7bc9
EBUILD calculate-utilities-3.1.7-r2.ebuild 761 SHA256 a8d68add7993bf5b4db8235dbad7158cd9b4b6b803af9c1bb9c690b40d0033d7 SHA512 13458804fbd04a44ac5a253edfa3877b8c31b665d8b5f6c9983066d5a6c3fdfcfc7f4ef57b89be4ec6c5343cb0faad6dce31bb5897fefa4b68eab33e6140ac3f WHIRLPOOL 7a73cb1dde57bc32faf28a2b90bde17e5f91dfa94b3ee49e9a56693a33152b6d08ca06ed3ee5ec39a4e98e62a6e612f0a62b3ef8ea28d690456ed3016f4f699f
EBUILD calculate-utilities-3.1.7-r3.ebuild 761 SHA256 2bd5a011805391c9ea03f0a58b622ab8ebb8906f288abdc0c1ce7031ae930657 SHA512 ddc9ee47a3d04e112036e175986e8bf01fb1e8ef33cddd2fc69cc01f56df22bf7c20c1db144da8abedb2b15e7ec9644615a0676c267f47842498496e0c9d88ea WHIRLPOOL f1db0c0573abf5c238b9c76a4112313b0f57f4a43599e8a082a0e19bdfbcf991b5f3f4452f0473d30a6808a48e18933f0734331e2bb5ff2cdb9e88a7a2f66f0b
EBUILD calculate-utilities-3.1.7-r4.ebuild 761 SHA256 eb606a6659e4d07aa32047105ce661fa6c9e38559aecbb9c32ce606d307e2a75 SHA512 4f9d7a6099c6eaffacaf358ff0e6ba82b0565c1f5f5c9783ed31c59c4d47b4ba921e575d850f34abd1e29676044443bcaa835c83ab432ac7499c4f7f193b8605 WHIRLPOOL ef63faaf1967f416fbe4b1d3841725c57979c100a9b8b8ec391f0b0d4cc90ebbc795d3d23f6cf229088892bf1732a8f3fd0d52772c8626560ff5b50eb7510138

@ -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-r5
=sys-apps/calculate-i18n-3.1.7
=sys-apps/calculate-lib-3.1.7-r5
=sys-apps/calculate-core-3.1.7-r10
=sys-apps/calculate-update-3.1.7-r2
cl_client? ( =sys-apps/calculate-client-3.1.7-r3 )
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