parent
8f05b2318b
commit
e010529318
@ -0,0 +1,40 @@
|
||||
# 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 setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-3.2.0_alpha10
|
||||
!<sys-apps/calculate-client-3.1.0
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
dev-qt/qtdbus
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
sys-auth/pam_client
|
||||
dev-lang/swig"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-client-3.2.0_alpha10-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
diff --git client/utils/cl_client_sync.py client/utils/cl_client_sync.py
|
||||
index 59d9197..fbcdc71 100644
|
||||
--- client/utils/cl_client_sync.py
|
||||
+++ client/utils/cl_client_sync.py
|
||||
@@ -86,7 +86,8 @@ class ClClientSyncLoginAction(Action):
|
||||
},
|
||||
# проверка на попытку открыть вторую сессию для этого пользователя
|
||||
{'name':'two_session',
|
||||
- 'error':__("Second X session for user {ur_login} cannot be opened."),
|
||||
+ 'error':
|
||||
+ __("A second X session cannot be opened for user {ur_login}."),
|
||||
'condition':lambda dv: (dv.Get('ur_login') in
|
||||
dv.Get('desktop.cl_desktop_online_user') and
|
||||
int(dv.Select('desktop.cl_desktop_online_count',
|
||||
@ -0,0 +1,29 @@
|
||||
# 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="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_alpha10"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-console-3.2.0_alpha10-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
diff --git console/application/methods_func.py console/application/methods_func.py
|
||||
index 1d9b609..8c53dab 100644
|
||||
--- console/application/methods_func.py
|
||||
+++ console/application/methods_func.py
|
||||
@@ -67,7 +67,8 @@ def parse():
|
||||
dest='pid_res', help=_("view the result of the process"))
|
||||
parser.add_argument(
|
||||
'--keep-result', action='store_true', default=False,
|
||||
- dest='keep_result', help=_("keep cache of process result"))
|
||||
+ dest='keep_result', help=_("keep the cache of the relevant "
|
||||
+ "process results"))
|
||||
parser.add_argument(
|
||||
'--pid-kill', type=int, metavar = 'PID',
|
||||
dest='pid_kill', help=_("kill the selected process"))
|
||||
@ -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_alpha10
|
||||
>=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_alpha10-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
diff --git core/server/methods_func.py core/server/methods_func.py
|
||||
index 5a25e4e..3393f49 100644
|
||||
--- core/server/methods_func.py
|
||||
+++ core/server/methods_func.py
|
||||
@@ -237,7 +237,8 @@ def get_method_argparser(view, args, cl_core = False):
|
||||
# data['metavar'] = field.name.upper()
|
||||
if "choice" in field.type:
|
||||
data['help'] = "%s (%s)" % (
|
||||
- data['help'], _("'list' for display possible values"))
|
||||
+ data['help'],
|
||||
+ _("'list' for displaying possible values"))
|
||||
if field.element in ['check']:
|
||||
data['metavar'] = "ON/OFF"
|
||||
try:
|
||||
diff --git core/variables/setup_package.py core/variables/setup_package.py
|
||||
index ac6daf6..9da4e0d 100644
|
||||
--- core/variables/setup_package.py
|
||||
+++ core/variables/setup_package.py
|
||||
@@ -201,7 +201,7 @@ class VariableClCorePkgDesktopSet(Variable):
|
||||
def check(self,value):
|
||||
if self.Get('cl_templates_locate') == ["clt"] and value == "on":
|
||||
raise VariableError(
|
||||
- _("You shouldn't choice only clt location "
|
||||
+ _("You must not choose only clt location "
|
||||
"for desktop templates"))
|
||||
|
||||
def init(self):
|
||||
@ -0,0 +1,31 @@
|
||||
# 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 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_alpha10"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
${RDEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-i18n-3.2.0_alpha10-r1.patch"
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -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.2.0_alpha10
|
||||
!<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.2.0_alpha10-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,81 @@
|
||||
diff --git install/utils/cl_setup.py install/utils/cl_setup.py
|
||||
index e4ad417..f70b00a 100644
|
||||
--- install/utils/cl_setup.py
|
||||
+++ install/utils/cl_setup.py
|
||||
@@ -149,7 +149,7 @@ class ClSetupBootAction(ClSetupSystemAction):
|
||||
Get('os_install_scratch') == 'off')
|
||||
},
|
||||
{'name':'no_scratch',
|
||||
- 'warning':_("The builder mode is not longer supported"),
|
||||
+ 'warning':_("The builder mode is no longer supported"),
|
||||
'condition':lambda Get:Get('os_install_scratch') == 'on'
|
||||
},
|
||||
# изменить IO планировщик
|
||||
diff --git install/variables/X11.py install/variables/X11.py
|
||||
index a30d448..f41c345 100644
|
||||
--- install/variables/X11.py
|
||||
+++ install/variables/X11.py
|
||||
@@ -37,12 +37,12 @@ class VideoVariable(Variable):
|
||||
"""
|
||||
xorg_need = True
|
||||
default_video = "default"
|
||||
- driver_names = {'nvidia': _("Nvidia proprietary video driver"),
|
||||
- 'fglrx': _("Ati proprietary video driver"),
|
||||
+ driver_names = {'nvidia': _("NVidia proprietary video driver"),
|
||||
+ 'fglrx': _("ATI proprietary video driver"),
|
||||
'intel': _("Intel video driver"),
|
||||
- 'radeon': _("Ati open source video driver"),
|
||||
- 'nouveau': _("Nvidia open source video driver"),
|
||||
- 'default': _("X.Org Server auto-detect")
|
||||
+ 'radeon': _("ATI open source video driver"),
|
||||
+ 'nouveau': _("NVidia open source video driver"),
|
||||
+ 'default': _("X.Org Server auto detection")
|
||||
}
|
||||
|
||||
def uncompatible(self):
|
||||
diff --git install/variables/audio.py install/variables/audio.py
|
||||
index 5dc7a1c..b30cd6c 100644
|
||||
--- install/variables/audio.py
|
||||
+++ install/variables/audio.py
|
||||
@@ -116,5 +116,5 @@ class VariableOsAudioDefault(Variable):
|
||||
return _("Audio configuration unavailable for Flash install")
|
||||
if self.Get('os_install_alsa_set') == 'off':
|
||||
return \
|
||||
- _("This distribution does not provide the alsa sound")
|
||||
+ _("This distribution does not provide the ALSA sound")
|
||||
return ""
|
||||
diff --git install/variables/disk.py install/variables/disk.py
|
||||
index 16505fb..a4d700c 100644
|
||||
--- install/variables/disk.py
|
||||
+++ install/variables/disk.py
|
||||
@@ -1725,8 +1725,8 @@ class VariableOsInstallMbr(LocationHelper,Variable):
|
||||
raise VariableError(_("You need a disk with a dos "
|
||||
"table for Flash install"))
|
||||
if tableOnBootDisk == "dos" and useBtrfs:
|
||||
- raise VariableError(_("You need a disk with a gpt "
|
||||
- "table for install on btrfs"))
|
||||
+ raise VariableError(_("You need a disk with a GPT table for "
|
||||
+ "install on a btrfs partition"))
|
||||
if rootType in ("usb-hdd","hdd") and tableOnBootDisk == "gpt":
|
||||
efisize = self.Select('os_disk_size',
|
||||
where=['os_disk_id','os_disk_parent'],
|
||||
@@ -1737,15 +1737,15 @@ class VariableOsInstallMbr(LocationHelper,Variable):
|
||||
minsize = "%dMb" % (int(bios_grub_size) / Sizes.M)
|
||||
if not efisize:
|
||||
raise VariableError(
|
||||
- _("Boot device must have BIOS Boot "
|
||||
- "partition ({minsize})").format(minsize=minsize))
|
||||
+ _("Your boot device must have a BIOS Boot partition "
|
||||
+ "({minsize})").format(minsize=minsize))
|
||||
# проверка размера EF02 при установке на btrfs
|
||||
elif useBtrfs:
|
||||
if (efisize.isdigit() and bios_grub_size.isdigit() and
|
||||
int(efisize) < int(bios_grub_size)):
|
||||
raise VariableError(
|
||||
- _("Boot device must have BIOS Boot partition "
|
||||
- "({minsize})").format(minsize=minsize))
|
||||
+ _("Your boot device must have a BIOS Boot "
|
||||
+ "partition ({minsize})").format(minsize=minsize))
|
||||
if value:
|
||||
if self.Get('os_grub2_path'):
|
||||
self.checkForGrub2()
|
||||
@ -0,0 +1,37 @@
|
||||
# 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
|
||||
dev-python/progressbar
|
||||
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.2.0_alpha10-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,83 @@
|
||||
diff --git calculate/lib/cl_template.py calculate/lib/cl_template.py
|
||||
index 7363a50..2a91c1a 100644
|
||||
--- calculate/lib/cl_template.py
|
||||
+++ calculate/lib/cl_template.py
|
||||
@@ -4764,7 +4764,7 @@ gettext -d cl_template "$*"
|
||||
self.postmergePkgs.append(pkg)
|
||||
except:
|
||||
self.printWARNING(
|
||||
- _("Failed to reconfigure %s package")%pkg)
|
||||
+ _("Failed to reconfigure package %s")%pkg)
|
||||
else:
|
||||
mergePkgs = mergePkgs + postmergePkgs
|
||||
|
||||
@@ -4959,9 +4959,8 @@ gettext -d cl_template "$*"
|
||||
try:
|
||||
os.chmod(applyDir, mode)
|
||||
except:
|
||||
- self.setError(
|
||||
- _("Failed to change mode for directory: ") +\
|
||||
- applyDir)
|
||||
+ self.setError(_("Failed to change the mode for "
|
||||
+ "the directory: ") +applyDir)
|
||||
else:
|
||||
self.setError(_("Wrong value 'chmod' in the template") + ": " +\
|
||||
templateDirFile)
|
||||
diff --git calculate/lib/datavars.py calculate/lib/datavars.py
|
||||
index eb7f38d..052a5e5 100644
|
||||
--- calculate/lib/datavars.py
|
||||
+++ calculate/lib/datavars.py
|
||||
@@ -394,13 +394,13 @@ class Variable:
|
||||
if "list" in self.type:
|
||||
if not type(value) in (list,tuple):
|
||||
raise VariableError(
|
||||
- _("Value for variable '{varname}' may be {vartype} only").format(
|
||||
+ _("The value for variable '{varname}' may be {vartype} only").format(
|
||||
varname=self.label or self.name,
|
||||
vartype="list"))
|
||||
error = _("Values for variable '{varname}' may be {vartype} only")
|
||||
else:
|
||||
value = repeat(value,1)
|
||||
- error = _("Value for variable '{varname}' may be {vartype} only")
|
||||
+ error = _("The value for variable '{varname}' may be {vartype} only")
|
||||
if "string" in self.type:
|
||||
value, valuecopy = tee(value,2)
|
||||
for v in (x for x in valuecopy if not type(x) in (str,unicode)):
|
||||
@@ -425,7 +425,7 @@ class Variable:
|
||||
error = _("Values for variable '{varname}' may "
|
||||
"be {vartype}")
|
||||
else:
|
||||
- error = _("Value for variable '{varname}' may be "
|
||||
+ error = _("The value for variable '{varname}' may be "
|
||||
"{vartype}")
|
||||
self.raiseWrongChoice(name, tipChoice, val, error)
|
||||
if "choice" in self.type and not "choiceedit" in self.type:
|
||||
@@ -589,7 +589,7 @@ class TableVariable(Variable):
|
||||
if not type(value) in (list,tuple) or \
|
||||
any(i for i in value if not type(i) in (tuple,list)):
|
||||
raise VariableError(
|
||||
- _("Value for {varname} may be '{vartype}' only").format(
|
||||
+ _("The value for {varname} may be '{vartype}' only").format(
|
||||
varname=self.label or self.name,
|
||||
vartype="table"))
|
||||
# check len all entries
|
||||
diff --git calculate/lib/variables/env.py calculate/lib/variables/env.py
|
||||
index f35e3f7..8788dc4 100644
|
||||
--- calculate/lib/variables/env.py
|
||||
+++ calculate/lib/variables/env.py
|
||||
@@ -366,7 +366,7 @@ class VariableClTemplatesLocate(Variable):
|
||||
|
||||
descriptionMap = {'overlay': _('Overlay templates'),
|
||||
'local': _('Local templates'),
|
||||
- 'distro': _('Distributive templates'),
|
||||
+ 'distro': _('Distribution templates'),
|
||||
'remote': _('Remote templates'),
|
||||
'clt': _('clt templates')}
|
||||
|
||||
@@ -427,5 +427,5 @@ class VariableClMakeProfile(Variable):
|
||||
val = self.get_work_link(
|
||||
*[path.join(self.systemRoot, x) for x in files])
|
||||
if not val:
|
||||
- raise VariableError(_("Failed to detect system profile"))
|
||||
+ raise VariableError(_("Failed to detect the system profile"))
|
||||
return val
|
||||
@ -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_alpha10
|
||||
~sys-apps/calculate-install-3.2.0_alpha10
|
||||
dev-python/pexpect"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-update-3.2.0_alpha10-r1.patch"
|
||||
}
|
||||
@ -0,0 +1,428 @@
|
||||
diff --git update/emerge_parser.py update/emerge_parser.py
|
||||
index 80d012b..a319a80 100644
|
||||
--- update/emerge_parser.py
|
||||
+++ update/emerge_parser.py
|
||||
@@ -447,7 +447,7 @@ class EmergeingErrorBlock(EmergeInformationBlock):
|
||||
return self.text_converter.transform(readFile(self.result))
|
||||
|
||||
def action(self, child):
|
||||
- raise EmergeError(_("Emerge %s is failed") % self.package)
|
||||
+ raise EmergeError(_("Failed to emerge %s") % self.package)
|
||||
|
||||
|
||||
class RevdepPercentBlock(NotifierInformationBlock):
|
||||
diff --git update/package_tools.py update/package_tools.py
|
||||
index dd86cbd..61c319f 100644
|
||||
--- update/package_tools.py
|
||||
+++ update/package_tools.py
|
||||
@@ -140,11 +140,11 @@ class Git:
|
||||
if path.exists(rpath):
|
||||
if not path.isdir(rpath):
|
||||
raise GitError(
|
||||
- _("Repository {path} is not directory").format(
|
||||
+ _("Repository {path} is not a directory").format(
|
||||
path=rpath))
|
||||
if not path.isdir(self._gitDir(rpath)):
|
||||
raise GitError(
|
||||
- _("Repository {path} is not git").format(
|
||||
+ _("Repository {path} is not Git").format(
|
||||
path=rpath))
|
||||
return True
|
||||
return False
|
||||
@@ -155,7 +155,7 @@ class Git:
|
||||
"""
|
||||
git = getProgPath("/usr/bin/git")
|
||||
if not git:
|
||||
- raise GitError(_("Git utility is not found"))
|
||||
+ raise GitError(_("The Git tool is not found"))
|
||||
return git
|
||||
|
||||
@staticmethod
|
||||
@@ -191,9 +191,9 @@ class Git:
|
||||
error = gitClone.read()
|
||||
if "Remote branch %s not found" % branch in error:
|
||||
raise GitError(
|
||||
- _("Branch {branch} not found in {url} repository").format(
|
||||
+ _("Branch {branch} not found in repository {url}").format(
|
||||
branch=branch, url=url))
|
||||
- raise GitError(_("Failed to clone {url} repository").format(
|
||||
+ raise GitError(_("Failed to clone repository {url}").format(
|
||||
url=url), error)
|
||||
return True
|
||||
|
||||
@@ -272,7 +272,7 @@ class Git:
|
||||
if command("get_rev_tag") or command("fetchshallow"):
|
||||
if not command("has_branch"):
|
||||
raise GitError(
|
||||
- _("Branch {branch} not found in {url} repository"
|
||||
+ _("Branch {branch} not found in repository {url}"
|
||||
).format(branch=branch, url=url))
|
||||
# если среди коммитов есть указанный коммит
|
||||
if command("has_revision"):
|
||||
@@ -281,7 +281,7 @@ class Git:
|
||||
return True
|
||||
elif command("checkout"):
|
||||
return False
|
||||
- raise GitError(_("Failed to clone {url} repository").format(
|
||||
+ raise GitError(_("Failed to clone repository {url}").format(
|
||||
url=url), error[-1])
|
||||
|
||||
def pullRepository(self, rpath, quiet_error=False, cb_progress=None):
|
||||
@@ -294,7 +294,7 @@ class Git:
|
||||
if not quiet_error:
|
||||
error = gitPull.read()
|
||||
raise GitError(
|
||||
- _("Failed to update repository in {rpath}").format(
|
||||
+ _("Failed to update the repository in {rpath}").format(
|
||||
rpath=rpath), error)
|
||||
return False
|
||||
return True
|
||||
@@ -316,7 +316,7 @@ class Git:
|
||||
if gitFetch.failed():
|
||||
error = gitFetch.read()
|
||||
raise GitError(
|
||||
- _("Failed to update repository in {rpath}").format(
|
||||
+ _("Failed to update the repository in {rpath}").format(
|
||||
rpath=rpath), error)
|
||||
return True
|
||||
|
||||
@@ -332,7 +332,7 @@ class Git:
|
||||
return not any(x.strip() for x in git_status)
|
||||
else:
|
||||
raise GitError(
|
||||
- _("Wrong repository in {rpath} directory").format(
|
||||
+ _("Wrong repository in the {rpath} directory").format(
|
||||
rpath=rpath))
|
||||
|
||||
def parseStatusInfo(self, data):
|
||||
@@ -376,8 +376,7 @@ class Git:
|
||||
return git_show.read().strip()
|
||||
else:
|
||||
raise GitError(
|
||||
- _("Failed to get status of repository in "
|
||||
- "{rpath} directory").format(
|
||||
+ _("Failed to get the repository status for {rpath}").format(
|
||||
rpath=rpath))
|
||||
|
||||
def getStatusInfo(self, rpath):
|
||||
@@ -395,13 +394,12 @@ class Git:
|
||||
retDict = self.parseStatusInfo(git_status.read())
|
||||
if not retDict:
|
||||
raise GitError(
|
||||
- _("Failed to get status of repository in "
|
||||
- "{rpath} directory").format(
|
||||
+ _("Failed to get the repository status for {rpath}").format(
|
||||
rpath=rpath))
|
||||
return retDict
|
||||
else:
|
||||
raise GitError(
|
||||
- _("Wrong repository in {rpath} directory").format(
|
||||
+ _("Wrong repository in the {rpath} directory").format(
|
||||
rpath=rpath))
|
||||
|
||||
def resetRepository(self, rpath, to_origin=False, to_rev=None, info=None):
|
||||
@@ -434,7 +432,7 @@ class Git:
|
||||
rpath,
|
||||
"clean", "-fd", stderr=STDOUT)
|
||||
if git_reset.failed() or git_clean.failed():
|
||||
- raise GitError(_("Failed to clean {rpath} repository").format(
|
||||
+ raise GitError(_("Failed to clean the {rpath} repository").format(
|
||||
rpath=rpath))
|
||||
return True
|
||||
|
||||
@@ -456,11 +454,11 @@ class Git:
|
||||
error = git_checkout.read()
|
||||
if "pathspec '%s' did not match" % branch in error:
|
||||
raise GitError(
|
||||
- _("Branch {branch} not found in {rpath} repository").format(
|
||||
+ _("Branch {branch} not found in repository {rpath}").format(
|
||||
branch=branch, rpath=rpath))
|
||||
raise GitError(
|
||||
- _("Failed to change branch to {branch} in "
|
||||
- "{rpath} repository").format(branch=branch,
|
||||
+ _("Failed to change branch to {branch} in the {rpath} "
|
||||
+ "repository").format(branch=branch,
|
||||
rpath=rpath), error)
|
||||
return True
|
||||
|
||||
diff --git update/update.py update/update.py
|
||||
index 2f867f4..ebd0757 100644
|
||||
--- update/update.py
|
||||
+++ update/update.py
|
||||
@@ -116,7 +116,7 @@ class Update:
|
||||
raise UpdateError(_("Update is already running. "
|
||||
"Try to run later."))
|
||||
else:
|
||||
- self.startTask(_("Waiting for complete another update"))
|
||||
+ self.startTask(_("Waiting for another update to be complete"))
|
||||
while any(ifilter(lambda x: os.getpid() != x,
|
||||
search_worked_process('update', dv))):
|
||||
time.sleep(0.3)
|
||||
@@ -133,8 +133,8 @@ class Update:
|
||||
"cl_update_rep_rev", "cl_update_branch_name"],
|
||||
where="cl_update_rep_name", eq=repname, limit=1))
|
||||
if not url or not rpath:
|
||||
- raise UpdateError(_("Variables with repositories settings "
|
||||
- "is not configured"))
|
||||
+ raise UpdateError(_("Configuration variables for repositories "
|
||||
+ "are not setup"))
|
||||
self.addProgress()
|
||||
if clean_on_error:
|
||||
try:
|
||||
@@ -148,7 +148,7 @@ class Update:
|
||||
self.printWARNING(str(e))
|
||||
self.endTask(False)
|
||||
self.startTask(
|
||||
- _("Re-fetch {name} repository").format(name=repname))
|
||||
+ _("Re-fetching the {name} repository").format(name=repname))
|
||||
self.addProgress()
|
||||
try:
|
||||
rpath_new = "%s_new" % rpath
|
||||
@@ -157,7 +157,7 @@ class Update:
|
||||
removeDir(rpath)
|
||||
os.rename(rpath_new, rpath)
|
||||
except OSError:
|
||||
- raise UpdateError(_("Permission denied to change "
|
||||
+ raise UpdateError(_("Permission denied to modify the "
|
||||
"{repname} repository").format(
|
||||
repname=repname))
|
||||
finally:
|
||||
@@ -179,7 +179,7 @@ class Update:
|
||||
"""
|
||||
layman = getProgPath('/usr/bin/layman')
|
||||
if not layman:
|
||||
- raise UpdateError(_("Layman utility is not found"))
|
||||
+ raise UpdateError(_("The Layman tool is not found"))
|
||||
rpath = self.clVars.Select('cl_update_other_rep_path',
|
||||
where='cl_update_other_rep_name', eq=repname,
|
||||
limit=1)
|
||||
@@ -193,7 +193,7 @@ class Update:
|
||||
p = process(layman, "-s", repname, stderr=STDOUT)
|
||||
if p.failed():
|
||||
raise UpdateError(
|
||||
- _("Failed to update repository {rname}").format(rname=repname),
|
||||
+ _("Failed to update the {rname} repository").format(rname=repname),
|
||||
addon=p.read())
|
||||
return True
|
||||
|
||||
@@ -203,12 +203,12 @@ class Update:
|
||||
"""
|
||||
egenCache = getProgPath('/usr/bin/egencache')
|
||||
if not egenCache:
|
||||
- raise UpdateError(_("Portage utility is not found"))
|
||||
+ raise UpdateError(_("The Portage tool is not found"))
|
||||
cpu_num = self.clVars.Get('hr_cpu_num')
|
||||
p = process(egenCache, "--repo=%s" % repname, "--update",
|
||||
"--jobs=%s" % cpu_num, stderr=STDOUT)
|
||||
if p.failed():
|
||||
- raise UpdateError(_("Failed to update cache of {rname} "
|
||||
+ raise UpdateError(_("Failed to update the cache of the {rname} "
|
||||
"repository").format(rname=repname),
|
||||
addon=p.read())
|
||||
return True
|
||||
@@ -219,7 +219,7 @@ class Update:
|
||||
"""
|
||||
emerge = getProgPath("/usr/bin/emerge")
|
||||
if not emerge:
|
||||
- raise UpdateError(_("Emerge utility is not found"))
|
||||
+ raise UpdateError(_("The Emerge tool is not found"))
|
||||
self.addProgress()
|
||||
p = PercentProgress(emerge, "--metadata", part=1, atty=True)
|
||||
for perc in p.progress():
|
||||
@@ -238,7 +238,7 @@ class Update:
|
||||
"""
|
||||
eixupdate = getProgPath("/usr/bin/eix-update")
|
||||
if not eixupdate:
|
||||
- raise UpdateError(_("Eix utility is not found"))
|
||||
+ raise UpdateError(_("The Eix tool is not found"))
|
||||
self.addProgress()
|
||||
excludeList = []
|
||||
if self.clVars.Get('cl_update_eixupdate_force') == 'force':
|
||||
@@ -337,7 +337,7 @@ class Update:
|
||||
"""
|
||||
cmd_path = getProgPath(cmd)
|
||||
if not cmd_path:
|
||||
- raise UpdateError(_("Failed to find %s command") % cmd)
|
||||
+ raise UpdateError(_("Failed to find the %s command") % cmd)
|
||||
with EmergeParser(
|
||||
emerge_parser.CommandExecutor(cmd_path, params)) as emerge:
|
||||
self._startEmerging(emerge)
|
||||
@@ -349,7 +349,7 @@ class Update:
|
||||
"""
|
||||
cmd_path = getProgPath(cmd)
|
||||
if not cmd_path:
|
||||
- raise UpdateError(_("Failed to find %s command") % cmd)
|
||||
+ raise UpdateError(_("Failed to find the %s command") % cmd)
|
||||
with EmergeParser(
|
||||
emerge_parser.CommandExecutor(cmd_path, params)) as emerge:
|
||||
revdep = RevdepPercentBlock(emerge)
|
||||
@@ -409,7 +409,7 @@ class Update:
|
||||
self._display_pretty_package_list(pkglist)
|
||||
if emerge.install_packages.remove_list:
|
||||
self.printSUCCESS(_print(
|
||||
- _("List removal packages")))
|
||||
+ _("Listing packages for removal")))
|
||||
self._display_pretty_package_list(
|
||||
emerge.install_packages.remove_list, remove_list=True)
|
||||
if str(emerge.download_size) != "0 kB":
|
||||
@@ -427,7 +427,7 @@ class Update:
|
||||
_print = self.color_print
|
||||
pkglist = emerge.uninstall_packages.list
|
||||
self.printSUCCESS(_print.bold(
|
||||
- _("List removal packages")))
|
||||
+ _("Listing packages for removal")))
|
||||
self._display_pretty_package_list(pkglist, remove_list=True)
|
||||
|
||||
def getCacheOnWorld(self, params, packages, check=False):
|
||||
diff --git update/utils/cl_update.py update/utils/cl_update.py
|
||||
index 2ac2c36..98cf5a5 100644
|
||||
--- update/utils/cl_update.py
|
||||
+++ update/utils/cl_update.py
|
||||
@@ -151,7 +151,7 @@ class ClUpdateAction(Action):
|
||||
]
|
||||
},
|
||||
{'name': 'update_other:depclean',
|
||||
- 'group': __("Cleaning system from needless packages"),
|
||||
+ 'group': __("Cleaning the system from needless packages"),
|
||||
'tasks': [
|
||||
{'name': 'update_other:update_depclean',
|
||||
'message': __("Calculating dependencies"),
|
||||
@@ -236,7 +236,7 @@ class ClUpdateAction(Action):
|
||||
'essential': False,
|
||||
},
|
||||
{'name': 'emerge_metadata',
|
||||
- 'message': __("Metadata trasfer"),
|
||||
+ 'message': __("Metadata transfer"),
|
||||
'method': 'Update.emergeMetadata()',
|
||||
'condition': (
|
||||
lambda Get: (Get('cl_update_outdate_set') == 'on' and
|
||||
@@ -244,7 +244,7 @@ class ClUpdateAction(Action):
|
||||
Get('cl_update_metadata_force') == 'force'))
|
||||
},
|
||||
{'name': 'eix_update',
|
||||
- 'message': __("Updating eix cache"),
|
||||
+ 'message': __("Updating the eix cache"),
|
||||
'method': 'Update.eixUpdate()',
|
||||
'condition': (
|
||||
lambda Get: (Get('cl_update_outdate_set') == 'on' and
|
||||
diff --git update/variables/update.py update/variables/update.py
|
||||
index 01eedf8..0276858 100644
|
||||
--- update/variables/update.py
|
||||
+++ update/variables/update.py
|
||||
@@ -74,8 +74,8 @@ class VariableClUpdateRevSet(Variable):
|
||||
"cl_update_eixupdate_force"]
|
||||
|
||||
def init(self):
|
||||
- self.help = _("revision update")
|
||||
- self.label = _("Revision update")
|
||||
+ self.help = _("make a revision update")
|
||||
+ self.label = _("Make a revision update")
|
||||
|
||||
class VariableClUpdateRep(Variable):
|
||||
"""
|
||||
@@ -122,7 +122,7 @@ class VariableClUpdateSystemProfile(ReadonlyVariable):
|
||||
path.join(path.dirname(make_profile),
|
||||
os.readlink(make_profile)))
|
||||
except:
|
||||
- raise VariableError(_("Failed to determine system profile"))
|
||||
+ raise VariableError(_("Failed to determine the system profile"))
|
||||
|
||||
class VariableClUpdateLaymanStorage(ReadonlyVariable):
|
||||
"""
|
||||
@@ -239,8 +239,8 @@ class VariableClUpdateSyncRep(Variable):
|
||||
untrusted = True
|
||||
|
||||
def init(self):
|
||||
- self.help = _("synchronize repositories (all by default)")
|
||||
- self.label = _("Synchronize repositories")
|
||||
+ self.help = _("synchronized repositories (all by default)")
|
||||
+ self.label = _("Synchronized repositories")
|
||||
|
||||
def set(self,value):
|
||||
orderList = self.Get('cl_update_rep_name')
|
||||
@@ -288,15 +288,15 @@ class VariableClUpdateMetadataForce(Variable):
|
||||
#untrusted = True
|
||||
|
||||
def init(self):
|
||||
- self.help = ("'force' - " + _("force update ebuilds metadata") +
|
||||
- ",\n'skip' - " + _("skip update ebuilds metadata") +
|
||||
- ",\n'auto' - " + _("update metadata if they are outdated"))
|
||||
+ self.help = ("'force' - " + _("force the update ebuilds metadata") +
|
||||
+ ",\n'skip' - " + _("skip the ebuild metadata update") +
|
||||
+ ",\n'auto' - " + _("update metadata if it is outdated"))
|
||||
self.label = _("Update metadata")
|
||||
|
||||
def choice(self):
|
||||
return [("force", _("Force")),
|
||||
("skip", _("Skip")),
|
||||
- ("auto", _("By need"))]
|
||||
+ ("auto", _("If needed"))]
|
||||
|
||||
class VariableClUpdateEixupdateForce(Variable):
|
||||
"""
|
||||
@@ -310,15 +310,16 @@ class VariableClUpdateEixupdateForce(Variable):
|
||||
#untrusted = True
|
||||
|
||||
def init(self):
|
||||
- self.help = ("'force' - " + _("force update eix cache") +
|
||||
- ",\n'skip' - " + _("skip update eix cache") +
|
||||
- ",\n'auto' - " + _("update eix cache if it is outdated"))
|
||||
- self.label = _("Update eix cache")
|
||||
+ self.help = ("'force' - " + _("force the eix cache update") +
|
||||
+ ",\n'skip' - " + _("skip the eix cache update") +
|
||||
+ ",\n'auto' - " + _("update the eix cache if it "
|
||||
+ "is outdated"))
|
||||
+ self.label = _("Update the eix cache")
|
||||
|
||||
def choice(self):
|
||||
return [("force", _("Force")),
|
||||
("skip", _("Skip")),
|
||||
- ("auto", _("By need"))]
|
||||
+ ("auto", _("If needed"))]
|
||||
|
||||
class VariableClUpdateOtherSet(Variable):
|
||||
"""
|
||||
@@ -389,9 +390,10 @@ class VariableClUpdatePretendSet(Variable):
|
||||
opt = ["-p", "--pretend"]
|
||||
|
||||
def init(self):
|
||||
- self.label = _("Pretend package update")
|
||||
- self.help = _("instead of actually performing packages update, "
|
||||
- "simply only display what have been installed")
|
||||
+ self.label = _("Pretend a package update")
|
||||
+ self.help = _("instead of actually performing the update, "
|
||||
+ "simply display the list of packages that "
|
||||
+ "will be installed")
|
||||
|
||||
class VariableClUpdateSyncOnlySet(Variable):
|
||||
"""
|
||||
@@ -423,5 +425,5 @@ class VariableClUpdateWaitAnotherSet(Variable):
|
||||
opt = ["--wait-another-update"]
|
||||
|
||||
def init(self):
|
||||
- self.label = _("Wait for complete another update")
|
||||
- self.help = _("wait until the other updates or abort")
|
||||
+ self.label = _("Wait for another update to be complete")
|
||||
+ self.help = _("wait until the running update is finished")
|
||||
diff --git update/wsdl_update.py update/wsdl_update.py
|
||||
index 10ec376..9bd535e 100644
|
||||
--- update/wsdl_update.py
|
||||
+++ update/wsdl_update.py
|
||||
@@ -39,7 +39,7 @@ class Wsdl(WsdlBase):
|
||||
# категория метода
|
||||
'category': __('Update'),
|
||||
# заголовок метода
|
||||
- 'title': __("Update System"),
|
||||
+ 'title': __("Update the System"),
|
||||
# иконка для графической консоли
|
||||
'image': 'software-properties,preferences-desktop',
|
||||
# метод присутствует в графической консоли
|
||||
@@ -60,7 +60,7 @@ class Wsdl(WsdlBase):
|
||||
'setvars': {'cl_action!': 'sync'},
|
||||
# описание груп (список лямбда функций)
|
||||
'groups': [
|
||||
- lambda group: group(_("Update system"),
|
||||
+ lambda group: group(_("Update the system"),
|
||||
normal=(),
|
||||
expert=(
|
||||
'cl_rebuild_world_set', 'cl_update_rev_set',
|
||||
@ -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_alpha10-r1
|
||||
=sys-apps/calculate-i18n-3.2.0_alpha10-r1
|
||||
=sys-apps/calculate-lib-3.2.0_alpha10-r1
|
||||
=sys-apps/calculate-core-3.2.0_alpha10-r1
|
||||
=sys-apps/calculate-update-3.2.0_alpha10-r1
|
||||
cl_client? ( =sys-apps/calculate-client-3.2.0_alpha10-r1 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.2.0_alpha10 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.2.0_alpha10 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.2.0_alpha10-r1 )
|
||||
"
|
||||
Loading…
Reference in new issue