Обновление переводов

atratsevskiy
Mike Khiretskiy 10 years ago
parent 32b8643ed9
commit c6e39c5899

@ -1,6 +1,7 @@
AUX calculate-i18n-3.2.0_alpha11-r2.patch 65024 SHA256 7a4dbfc76971a15bf7da4d7813c9ae83e75ca9e1d415737bf4d343adebab05a9 SHA512 af73c886a49ccc755e2321b324c303024385033e201f23873396fbd1f20070d711f3224c2593146c19930e1f1ebd696df614586d1650ba43226dd31da9176db5 WHIRLPOOL f4de9f4286ecd08a198c930bf057e20b76248c899091c467c3c2cb22fc9a306768c2769dc95c1f65f4131d2ecfecd910f80dbaab709a913cdd0c72c37fb67c4a
AUX calculate-i18n-3.2.0_alpha12-r1.patch 10694 SHA256 985408c27498779fff51f7a678b9b9d6ee9280aaf2df7fd83bea4f48e1e389e9 SHA512 a73552203dc030a6942f1d1ac529a199aa4f3da664864b36722608ff2b008719e3cf2bfe6f565c9fc2c9868f687c7329767c30a1b9700fe36a31e20b87888239 WHIRLPOOL dbbe77ededeba5e3572edf9e3e537ef88c51045c25af1f179212ed19688b92f8743cba7fdfb8c379490146ca5d260e56203a5f28ab2ea15872d88714f72b18e2
AUX calculate-i18n-3.2.0_alpha12-r2.patch 11904 SHA256 b7a6cd83a6d3352f2fb4307df0018c6b4b0f1cb9c66642b2dea58cc7119e840a SHA512 8313a3e2035bd107a06b8cbcd39c879afaceb55053294201b7f09735b6849f773a23373a98e4a48d1a7e7d6492c2a415df42a6f43807506754a0821dc3f9c6ed WHIRLPOOL 3dba5465e4a27e42034870c9eafe2431f1305aa30eb8fb6057a64ce466c82ad3f7d093b9d61e43400cd3acf5b7df715ced6c95c29bff4ac8758ca099cdf1ae17
AUX calculate-i18n-3.2.0_alpha12-r3.patch 20463 SHA256 6bf9390fc3fde0cd0d857ce4a9017930022e8cadfb1df672acd5ab083a74d223 SHA512 950a14c6587c7f7821405a4adf2bf6b075fe0e2820c9226772b514ea923bab26b3cd89b32acc41eaab9c388087753768e5fdc0c4b613f17cb333cd888aee2e9e WHIRLPOOL 4b3ee47fbd99f2be8739d856e5537ac38015b061e6f9434e922ec6deafb7ce1a1697e2b9b5a02e70acfd923b8da445db096857b068808b7c974a191e0260ca52
DIST calculate-i18n-2.2.31.tar.bz2 33616 SHA256 0c0a8588b5e7d7dffd06e5d763108fc069cb65ef48965ca7c762ccdde213476b SHA512 6d9cc4c8d7696d77017db7119e53ed766b759f063d1d68804e7f816e238d83c4e69df80db739144811813a6adde0bc15253fbaf0ce257e9162fefc6043b2fed4 WHIRLPOOL ffd0185124ef89323c3fc527df2e3068aff77b5981ffaf93e3e6c54aead2913b0b60abdb939290e0689c5191902acbdefdac75effd6047cbd39db95496300f1b
DIST calculate-i18n-3.1.9.tar.bz2 61189 SHA256 6851a341dbb66baf68d03fdb27fd0dcdb467fd5c595860bb6e6beb74b4109122 SHA512 81ee9f4c0e703c41e1c3942c549592f8b8f3d299b4c87531979ef21bb0579b901cc36c25a0746a1e21865ec328bf1f5451eac6ff4511c9be7bd1e575a4d8e575 WHIRLPOOL 2e5e44ad88705dec80077a0badfbe37fefcd9f61bfe651d71ce1844771a757b148dadb7c588627ffa755ee8c0e36b1ac762fe3126c5cee148396985abe8fb1ab
DIST calculate-i18n-3.2.0_alpha11.tar.bz2 126521 SHA256 a537ee5b9870a7e79ce723acad61163ae0cc41b97d390bef2374c7c92671be4e SHA512 e37f677352bd66de55163c8613af8a61aa2480186b4ac7a53b62b67ff3656958cbc2a26939393f537da843283af61493866e9f401d6fc906d1999259d10b8433 WHIRLPOOL 7cc767fbbc50042193e88c8413c64f444c81c5e74f8d3d7c1f2184f885d3cc5ff6b61aaecbc0797873945f851f8b7e1eb870d5174d6c5749464492a682f708f4
@ -12,6 +13,7 @@ EBUILD calculate-i18n-3.1.9999.ebuild 583 SHA256 aa60c513b0f672aa9618bfd8099fefa
EBUILD calculate-i18n-3.2.0_alpha11-r2.ebuild 735 SHA256 234d31a423351cd03e2a487d9432649969c8161e3269cd19a504502dec9e7a28 SHA512 607ad160b3389fa87ad7354660db9c7c9917eb92676514a7f2a45e0fd2c57835ba2aaeafab174f17fd38368a6bae0c41eda920d298a1fa01e94af85e3967401c WHIRLPOOL 0073f514df70f2747c9883407737968450ba7d57145e4e11efd56e6f2f99e31b2c96829bcf35534b02ee9b9b43c92e9ef32474f3ab1a5e71f9d20cc1e8725c33
EBUILD calculate-i18n-3.2.0_alpha12-r1.ebuild 733 SHA256 9ad9d4cc25056c2ede1b7b242d3ef7980467b990fb611dd4006d2b19d8ca9062 SHA512 ff6bd42eae0f51dc0604fd813437fc4c0b309b487feb086a73e72a9935ef97b9cc1e6341904b25b061dc36e08d293c38999ce1180814b4d31e58b1a80b9986d9 WHIRLPOOL b7db4cbd41467dd667001a2bddc89eed0b638e61d07de7c9355d9e254cfe56b62b132741949deb332fa26ea51fc3d0f46253525ae78d64e14605b95ca5b232d0
EBUILD calculate-i18n-3.2.0_alpha12-r2.ebuild 733 SHA256 662840ffeb0c014cf1d5f0a4cb9209943913f1180ae3f79217b83e8c873f5819 SHA512 a04ae087b330f2b7087f98dff411f945d89ec6603530be7ad4e7171a67014bf39f55f58acf46c04e7e58e3372c8bf34d011c4087beb237db8e475c5cb2b9f690 WHIRLPOOL 7db31feb552925994f3ac0d5d61dc5b799a110c198bf8527783145a3b806b87018ad727d2bd4f0a167f6ae0b670d20f1b15f429cd768877fb9485905440c20fc
EBUILD calculate-i18n-3.2.0_alpha12-r3.ebuild 733 SHA256 6ff25c20fcfc449ea480689ef0662c7fcd3497de9e714f10e772329aab0c6da7 SHA512 d3abe2c75ae004944025773faeacd864fe00fdd304dbe40ca2be40d7afdd0417544eddb0baaedc377297f3b609a488640eba2ba7e374c3b309012cc8e48f220d WHIRLPOOL 19305aad886c20212603341e1138bfb5e5213ae960ceb5baa7de98bdca33a87ff1320efad6794839378d274533fd1a52a580e4fa0f7a76a280417273e61118e5
EBUILD calculate-i18n-3.2.0_alpha12.ebuild 590 SHA256 80dcf8ee2048fc3a87db88f3ab9b4fd8e410b03228697ba115e2e95351029a8e SHA512 a4ae54c13aa4be4e0e87bf35706ffb3d6d2c1633a986c39824463eda024900bcd897c9bc6f293a100addb5c458dfbc4acdb4ec6c191d4c04e71073334ead1f84 WHIRLPOOL 08ace1a8ba79adae5456150603175ea764a9a3c9ed4e9e700cab4fc91349348d141c3af7160b47096f07d4eb27b2df0f9c184194a75215b2b18a6f8c17401a13
EBUILD calculate-i18n-3.2.9999.ebuild 583 SHA256 aa60c513b0f672aa9618bfd8099fefaf49fa5ef9b24ee2645356da69563032fa SHA512 14b87ddb0f910e1b983ef465efdc56347abe01d4cdc11d6d81d593a2e65dcba1b79357d37952d7aa7f800fad8d30592db2e337d0fc6ca9807bdba618aff48528 WHIRLPOOL 14a1c4f1ef646aee28934e820763bd149e37860cce1ee34ac2229742980ec178fc43ba284b59a2f71a740cfa8e48ff7658a613b03eb0f84d4a10cefdd65450da
MISC ChangeLog 6384 SHA256 effc6918170f5331b649c7c25ccbbc971a71320be1be056da843adff998c5054 SHA512 5cca782e736ad7b526e434e7f4e1a3ed32bebf98704fda17751f3a8aa8b94896a2864f12edd4aa3fafdbc567db8282efa6355b2313cc119b275b87a756991d31 WHIRLPOOL e24811fac9e15f95144c27b27ae2509effcb3359aa24a9338ec88faffbe0588049367ac3fb8e2c9d823a1e259b1cac3c8503124aa161a9be598a209adffab56e

@ -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_alpha12"
DEPEND="sys-devel/gettext
${RDEPEND}"
src_unpack() {
unpack "${A}"
cd "${S}"
# apply revision changes
epatch "${FILESDIR}/calculate-i18n-3.2.0_alpha12-r3.patch"
}

@ -0,0 +1,618 @@
diff --git fr/cl_update3.po fr/cl_update3.po
index 9d2b1da..5753482 100644
--- fr/cl_update3.po
+++ fr/cl_update3.po
@@ -52,14 +52,20 @@ msgid "Waiting for another update to be complete"
msgstr ""
"En attente jusqu'à ce que la mise à jour précédemment lancée soit terminée"
+msgid "Emerge is running. Try to run later."
+msgstr "Emerge est en cours d'exécution. Réessayez plus tard."
+
+msgid "Waiting for emerge to be complete"
+msgstr ""
+
msgid "Configuration variables for repositories are not setup"
msgstr "Les variables de configuration des dépôts n'ont pas été configurées"
msgid "Re-fetching the {name} repository"
msgstr "On réessaie de synchroniser le dépôt {name}"
-msgid "Permission denied to modify the {repname} repository"
-msgstr "Permissions insuffisantes pour modifier le dépôt {repname}"
+msgid "Failed to modify the {repname} repository"
+msgstr "Impossible de modifier le dépôt {repname}"
msgid "The Layman tool is not found"
msgstr "L'outil Layman est introuvable"
@@ -70,6 +76,10 @@ msgstr "Impossible d'actualiser le dépôt {rname}"
msgid "The Portage tool is not found"
msgstr "L'outil Portage est introuvable"
+msgid "Repository '{repo_name}' called '{repname}' in cl_update_rep_name"
+msgstr ""
+"Le dépôt '{repo_name}' est désigné comme '{repname} dans cl_update_rep_name"
+
msgid "Failed to update the cache of the {rname} repository"
msgstr "Impossible d'actualiser le cache du dépôt {rname}"
@@ -85,12 +95,24 @@ msgstr "L'outil Eix est introuvable"
msgid "Failed to update eix cache"
msgstr "Impossible d'actualiser le cache eix"
-msgid "Emerging{part} {package}"
-msgstr "Compilation de {part} {package}"
+msgid "({current} of {maximum})"
+msgstr " ({current} sur {maximum})"
+
+msgid "{part} {package}"
+msgstr "{part} {package}"
+
+msgid "Emerging {package}"
+msgstr "Compilation de {package}"
+
+msgid "Installing {pkg} [{oldver}]"
+msgstr "Installation de {pkg} [{oldver}]"
msgid "Installing %s"
msgstr "Installation de %s"
+msgid "Fetching binary packages"
+msgstr ""
+
msgid " ({current} of {maximum})"
msgstr " ({current} sur {maximum})"
@@ -124,6 +146,18 @@ msgstr "Voulez-vous installer ces paquets ?"
msgid "Would you like to unmerge these packages?"
msgstr "Voulez-vous supprimer ces paquets ?"
+msgid "Wrong profile"
+msgstr "Profil erroné"
+
+msgid "Failed to determine profile %s"
+msgstr "Impossible de déterminer le profil %s"
+
+msgid "Failed to set the profile: %s"
+msgstr "Impossible de définir le profil : %s"
+
+msgid "Failed to move the profile: %s"
+msgstr "Impossible de déplacer le profil : %s"
+
msgid "Update"
msgstr "Actualiser"
@@ -133,6 +167,21 @@ msgstr "Mettre le système à jour"
msgid "Update the system"
msgstr "Mettre le système à jour"
+msgid "Update the Profile"
+msgstr "Actualiser le profil"
+
+msgid "Repository"
+msgstr "Dépôt"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Perform"
+msgstr "Exécuter"
+
+msgid "Set the profile"
+msgstr "Définir le profil"
+
msgid "Emerge failed"
msgstr "Emerge a échoué"
@@ -142,6 +191,42 @@ msgstr "Cette action requiert les droits administrateur"
msgid "Failed to emerge %s"
msgstr "La compilation de %s a échoué"
+msgid "The profile was successfully updated"
+msgstr "Le profil a bien été actualisé"
+
+msgid "Failed to update the profile"
+msgstr "Impossible d'actualiser le profil"
+
+msgid "Profile update manually interrupted"
+msgstr "L'actualisation du profil a été interrompue par l'utilisateur"
+
+msgid "Repository transfer"
+msgstr "Déplacement du dépôt"
+
+msgid "Repositories synchronization"
+msgstr "Synchronisation des dépôts"
+
+msgid "Syncing the {eachvar:capitalize} repository"
+msgstr "Synchronisation du dépôt {eachvar:capitalize}"
+
+msgid "Updating the {eachvar:capitalize} repository cache"
+msgstr "Actualisation du cache du dépôt {eachvar:capitalize}"
+
+msgid "Metadata transfer"
+msgstr "Transfert des métadonnées"
+
+msgid "Updating the eix cache"
+msgstr "Actualisation du cache eix"
+
+msgid "Synchronization finished"
+msgstr "Synchronisation terminée"
+
+msgid "Setting up the profile"
+msgstr "Définition du profil en cours"
+
+msgid "Switching to profile {cl_update_profile_system}"
+msgstr "Basculement vers le profil {cl_update_profile_system}"
+
msgid "Update failed"
msgstr "Mise à jour échouée"
@@ -200,23 +285,8 @@ msgstr "Mise à jour des bibliothèques réservées"
msgid "Checking reverse dependencies"
msgstr "Vérification des dépendances inverses"
-msgid "Repositories synchronization"
-msgstr "Synchronisation des dépôts"
-
-msgid "Syncing the {eachvar:capitalize} repository"
-msgstr "Synchronisation du dépôt {eachvar:capitalize}"
-
-msgid "Updating the {eachvar:capitalize} repository cache"
-msgstr "Actualisation du cache du dépôt {eachvar:capitalize}"
-
-msgid "Metadata transfer"
-msgstr "Transfert des métadonnées"
-
-msgid "Updating the eix cache"
-msgstr "Actualisation du cache eix"
-
-msgid "Synchronization finished"
-msgstr "Synchronisation terminée"
+msgid "Updating configuration files"
+msgstr "Mise à jour des fichiers de configuration"
msgid "System configuration"
msgstr "Configuration système"
@@ -242,9 +312,6 @@ msgstr "actualiser la révision"
msgid "Make a revision update"
msgstr "Actualiser la révision"
-msgid "Failed to determine the system profile"
-msgstr "Impossible de détecter le profil système"
-
msgid "set branches for repository (REPOSITORY:BRANCH)"
msgstr "indiquer les branches des dépôts (DÉPÔT:BRANCHE)\""
@@ -329,3 +396,69 @@ msgstr "Attendre avant qu'une mise à jour déjà lancée soit terminée"
msgid "wait until the running update is finished"
msgstr "attendre la fin de la mise à jour en cours"
+
+msgid "Distribution name"
+msgstr "Nom de la distribution"
+
+msgid "Used repositories"
+msgstr "Dépôts utilisés"
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "System profile version"
+msgstr "Version du profil système"
+
+msgid "Profile repository"
+msgstr "Dépôt du profil"
+
+msgid "set the profile repository"
+msgstr "définir le dépôt du profil"
+
+msgid "Wrong repository URL"
+msgstr "Lien brisé vers le dépôt"
+
+msgid "Failed to determine the repository host"
+msgstr "Impossible de déterminer l'hôte du dépot"
+
+msgid "Repository %s has no profiles"
+msgstr "Le dépôt %s ne fournit aucun profil"
+
+msgid "Repository name"
+msgstr "Nom du dépôt"
+
+msgid "Repository branch"
+msgstr "Branche du dépôt"
+
+msgid "set the repository branch"
+msgstr "définir la branche du dépôt"
+
+msgid "Failed to determine the system profile"
+msgstr "Impossible de détecter le profil système"
+
+msgid "System profile"
+msgstr "Profil système"
+
+msgid "set the system profile"
+msgstr "définir le profil système"
+
+msgid "You must specify the profile"
+msgstr "Vous devez spécifier le profil"
+
+msgid "Repository variables were not configured for the profile"
+msgstr "Les variables du dépôt n'ont pas été configurées pour le profil"
+
+msgid "Profile is not Calculate"
+msgstr ""
+
+msgid "Wrong Calculate profile"
+msgstr "Profil Calculate incorrect"
+
+msgid "Synchronize repositories"
+msgstr "Dépôts synchronisés"
+
+msgid "synchronize repositories"
+msgstr "Dépôts synchronisés"
diff --git ru/cl_core3.po ru/cl_core3.po
index c635dd3..aac5032 100644
--- ru/cl_core3.po
+++ ru/cl_core3.po
@@ -404,6 +404,9 @@ msgstr "не задавать вопросы во время процесса"
msgid "Wrong option "
msgstr "Неправильный параметр "
+msgid "%s values:"
+msgstr "%s:"
+
msgid "Password"
msgstr "Пароль"
@@ -936,6 +939,12 @@ msgstr "Удалена ссылка %s"
msgid "Unable to import %s"
msgstr "Невозможно импортировать %s"
+msgid "Wrong normal varaiable list"
+msgstr ""
+
+msgid "Wrong expert varaiable list"
+msgstr ""
+
msgid "No certificates"
msgstr "Нет сертификатов"
@@ -1271,6 +1280,12 @@ msgstr "Попробовать добавить корневой и сертиф
msgid "WARNING! %s trying to replace the certificate!"
msgstr "Внимание! %s пытается подменить сертификат!"
+msgid "Failed to connect"
+msgstr "Не удалось подключиться"
+
+msgid "Exception: %s"
+msgstr ""
+
msgid "Certificate not found in the server database!"
msgstr "Сертификат не найден в базе данных на сервере!"
diff --git ru/cl_emerge.po ru/cl_emerge.po
index e8d9906..d2b80cc 100644
--- ru/cl_emerge.po
+++ ru/cl_emerge.po
@@ -214,6 +214,7 @@ msgstr "пакеты которых больше нет в дереве порт
msgid "not be possible to satisfy their dependencies"
msgstr "сделать невозможным разрешить их зависимости"
+# emerge: there are no ebuilds built with USE flags to satisfy ">=dev-qt/qtgui-4.7.4:4[accessibility,dbus]"
msgid "there are no ebuilds built with USE flags to satisfy"
msgstr "нет ebuild файлов для сборки с USE флагами, соответствующих"
@@ -223,9 +224,12 @@ msgstr "нет ebuild файлов, соответствующих"
msgid "One of the following packages is required to complete your request"
msgstr "Один из последующих пакетов требуется для завершения вашего запроса"
+# !!! One of the following packages is required to complete your request:
+#- dev-qt/qtgui-4.8.5-r1::gentoo (Missing IUSE: dbus)
msgid "(Missing IUSE: "
msgstr "(Пропущен IUSE: "
+# (dependency required by "kde-misc/openofficeorg-thumbnail-1.0.0-r2" [installed])
msgid "\\(dependency required by "
msgstr "(требуется по зависимости для "
@@ -253,6 +257,10 @@ msgstr "\\1\\2 бинарных"
msgid "Total: (\\d+) packages"
msgstr "Итого: \\1 пакетов"
+# ERROR: app-emulation/vmware-modules-279.1::gentoo failed (compile phase):
+msgid "failed \\(compile phase\\):"
+msgstr ""
+
msgid "selected:"
msgstr "выбранные:"
diff --git ru/cl_lib3.po ru/cl_lib3.po
index 8785fea..0d3b6c3 100644
--- ru/cl_lib3.po
+++ ru/cl_lib3.po
@@ -395,6 +395,9 @@ msgstr ""
"Попытка переписать неизменяемое индексное поле {fieldname} в переменной "
"{variablename}"
+msgid "Failed to get value %s"
+msgstr "Не удалось получить значение %s"
+
msgid "Variable %s not found"
msgstr "Не найдена переменная %s"
@@ -684,8 +687,11 @@ msgstr "Местонахождение шаблонов"
msgid "select location for templates %s"
msgstr "выбор местонахождения шаблонов %s"
-msgid "Failed to detect the system profile"
-msgstr "Не удалось определить профиль системы"
+msgid "Failed to detect the system profile."
+msgstr "Не удалось определить профиль системы."
+
+msgid "Select profile by command {cmd}"
+msgstr "Выберите профиль с помощью команды {cmd}"
msgid "Custom action"
msgstr "Произвольное действие"
diff --git ru/cl_update3.po ru/cl_update3.po
index 1a9db95..3b60cc7 100644
--- ru/cl_update3.po
+++ ru/cl_update3.po
@@ -51,14 +51,20 @@ msgstr "Обновление уже запущено. Попытайтесь з
msgid "Waiting for another update to be complete"
msgstr "Ожидание завершения другого обновления"
+msgid "Emerge is running. Try to run later."
+msgstr "Emerge уже запущен. Попытайтесь запустить позже."
+
+msgid "Waiting for emerge to be complete"
+msgstr "Ожидание завершения выполнения emerge"
+
msgid "Configuration variables for repositories are not setup"
msgstr "Переменные конфигурации репозиториев не настроены"
msgid "Re-fetching the {name} repository"
msgstr "Повторное получение {name} репозитория"
-msgid "Permission denied to modify the {repname} repository"
-msgstr "Не достаточно прав для изменения {repname} репозитория"
+msgid "Failed to modify the {repname} repository"
+msgstr "Не удалось изменить репозиторий {repname}"
msgid "The Layman tool is not found"
msgstr "Утилита Layman не найдена"
@@ -69,6 +75,9 @@ msgstr "Не удалось обновить репозиторий {rname}"
msgid "The Portage tool is not found"
msgstr "Утилита Portage не найдена"
+msgid "Repository '{repo_name}' called '{repname}' in cl_update_rep_name"
+msgstr "Репозиторий '{repo_name}' назван '{repname} в cl_update_rep_name"
+
msgid "Failed to update the cache of the {rname} repository"
msgstr "Не удалось обновить кэш {rname} репозитория"
@@ -84,11 +93,17 @@ msgstr "Утилита Eix не найдена"
msgid "Failed to update eix cache"
msgstr "Не удалось обновить кэш eix"
-msgid " ({current} of {maximum})"
-msgstr " ({current} из {maximum})"
+msgid "({current} of {maximum})"
+msgstr "({current} из {maximum})"
+
+msgid "{part} {package}"
+msgstr "{part} {package}"
-msgid "Emerging{part} {package}"
-msgstr "Сборка{part} {package}"
+msgid "Emerging {package}"
+msgstr "Сборка {package}"
+
+msgid "Installing {pkg} [{oldver}]"
+msgstr "Установка {pkg} [{oldver}]"
msgid "Installing %s"
msgstr "Установка %s"
@@ -96,6 +111,9 @@ msgstr "Установка %s"
msgid "Fetching binary packages"
msgstr "Получение бинарных пакетов"
+msgid " ({current} of {maximum})"
+msgstr " ({current} из {maximum})"
+
msgid "Unmerging{part} {package}"
msgstr "Удаление{part} {package}"
@@ -126,6 +144,18 @@ msgstr "Вы хотите установить эти пакеты?"
msgid "Would you like to unmerge these packages?"
msgstr "Вы хотите удалить эти пакеты?"
+msgid "Wrong profile"
+msgstr "Неправильный профиль"
+
+msgid "Failed to determine profile %s"
+msgstr "Не удалось определить профиль %s"
+
+msgid "Failed to set the profile: %s"
+msgstr "Не удалось установить профиль: %s"
+
+msgid "Failed to move the profile: %s"
+msgstr "Не удалось переместить профиль: %s"
+
msgid "Update"
msgstr "Обновить"
@@ -135,6 +165,21 @@ msgstr "Обновление системы"
msgid "Update the system"
msgstr "Обновление системы"
+msgid "Update the Profile"
+msgstr "Обновить профиль"
+
+msgid "Repository"
+msgstr "Репозиторий"
+
+msgid "Profile"
+msgstr "Профиль"
+
+msgid "Perform"
+msgstr "Выполнить"
+
+msgid "Set the profile"
+msgstr "Установить профиль"
+
msgid "Emerge failed"
msgstr "Выполнение Emerge завершилось с ошибкой"
@@ -144,6 +189,42 @@ msgstr "Действие требует права суперпользоват
msgid "Failed to emerge %s"
msgstr "Не удалось собрать %s"
+msgid "The profile was successfully updated"
+msgstr "Обновление профиля завершено успешно"
+
+msgid "Failed to update the profile"
+msgstr "Не удалось обновить профиль"
+
+msgid "Profile update manually interrupted"
+msgstr "Обновление прервано пользователем"
+
+msgid "Repository transfer"
+msgstr "Перенос репозитория"
+
+msgid "Repositories synchronization"
+msgstr "Синхронизация репозиториев"
+
+msgid "Syncing the {eachvar:capitalize} repository"
+msgstr "Синхронизация {eachvar:capitalize} репозитория"
+
+msgid "Updating the {eachvar:capitalize} repository cache"
+msgstr "Обновление кэша {eachvar:capitalize} репозитория"
+
+msgid "Metadata transfer"
+msgstr "Перемещение метаданных"
+
+msgid "Updating the eix cache"
+msgstr "Обновление кэша eix"
+
+msgid "Synchronization finished"
+msgstr "Синхронизация завершена"
+
+msgid "Setting up the profile"
+msgstr "Настройка профиля"
+
+msgid "Switching to profile {cl_update_profile_system}"
+msgstr "Переключение на {cl_update_profile_system} профиль"
+
msgid "Update failed"
msgstr "Не удалось обновить"
@@ -201,23 +282,8 @@ msgstr "Обновление сохраненных библиотек"
msgid "Checking reverse dependencies"
msgstr "Проверка обратных зависимостей"
-msgid "Repositories synchronization"
-msgstr "Синхронизация репозиториев"
-
-msgid "Syncing the {eachvar:capitalize} repository"
-msgstr "Синхронизация {eachvar:capitalize} репозитория"
-
-msgid "Updating the {eachvar:capitalize} repository cache"
-msgstr "Обновление кэша {eachvar:capitalize} репозитория"
-
-msgid "Metadata transfer"
-msgstr "Перемещение метаданных"
-
-msgid "Updating the eix cache"
-msgstr "Обновление кэша eix"
-
-msgid "Synchronization finished"
-msgstr "Синхронизация завершена"
+msgid "Updating configuration files"
+msgstr "Обновление конфигурационных файлов"
msgid "System configuration"
msgstr "Конфигурация системы"
@@ -243,9 +309,6 @@ msgstr "обновить ревизию"
msgid "Make a revision update"
msgstr "Обновить ревизию"
-msgid "Failed to determine the system profile"
-msgstr "Не удалось определить профиль системы"
-
msgid "set branches for repository (REPOSITORY:BRANCH)"
msgstr "установить ветки для репозиториев (REPOSITORY:BRANCH)"
@@ -330,3 +393,69 @@ msgstr "Ждать пока завершится другое обновлени
msgid "wait until the running update is finished"
msgstr "ждать завершения"
+
+msgid "Distribution name"
+msgstr "Название дистрибутива"
+
+msgid "Used repositories"
+msgstr "Используемые репозитории"
+
+msgid "Name"
+msgstr "Название"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "System profile version"
+msgstr "Версия профиля системы"
+
+msgid "Profile repository"
+msgstr "Репозиторий профиля"
+
+msgid "set the profile repository"
+msgstr "установить репозиторий профиля"
+
+msgid "Wrong repository URL"
+msgstr "Неправильный URL репозитория"
+
+msgid "Failed to determine the repository host"
+msgstr "Не удалось определить хост репозитория"
+
+msgid "Repository %s has no profiles"
+msgstr "В репозитории %s нет профилей"
+
+msgid "Repository name"
+msgstr "Название репозитория"
+
+msgid "Repository branch"
+msgstr "Ветка репозитория"
+
+msgid "set the repository branch"
+msgstr "установить ветку репозитория"
+
+msgid "Failed to determine the system profile"
+msgstr "Не удалось определить профиль системы"
+
+msgid "System profile"
+msgstr "Профиль системы"
+
+msgid "set the system profile"
+msgstr "установить профиль системы"
+
+msgid "You must specify the profile"
+msgstr "Вы должны указать профиль"
+
+msgid "Repository variables were not configured for the profile"
+msgstr "В профиле не настроены переменные репозитория"
+
+msgid "Profile is not Calculate"
+msgstr "Профиль не Calculate"
+
+msgid "Wrong Calculate profile"
+msgstr "Неправильный Calculate профиль"
+
+msgid "Synchronize repositories"
+msgstr "Синхронизируемые репозитории"
+
+msgid "synchronize repositories"
+msgstr "Синхронизируемые репозитории"

@ -6,6 +6,7 @@ AUX calculate-update-3.2.0_alpha12-r1.patch 5462 SHA256 857411ad2241755d18c4d438
AUX calculate-update-3.2.0_alpha12-r3.patch 8769 SHA256 ef8b36fc01dc2baa9946249f176ba8944798f4c449fffcc3d7066cb773266483 SHA512 58811b481071ea26283b7f3ed1683188ea2a6a6c73b4c3be7ed414ec9977626bafd1cce1cc154b8566102e0e003677080fcc5dbf0973ef8247d0f36783dbe62c WHIRLPOOL ccfa7427c407b481382ae0df70e45ab185c0d4bc923654e7a69a5f7646703e45283d5e351a96d9ae41531d80a62495620c243ae57f361a8fe7a9cbcdee588ffd
AUX calculate-update-3.2.0_alpha12-r4.patch 11967 SHA256 3693dabfaf3885526768f8366ac0ac9249d102b3488d4b8abed3d04f64cb2201 SHA512 f55de5115ef5ac8204055214e53c41ca975136a2f20ea56d2e0f370692a994ee44c674b301dce76bbd9031976f6ebc3dfc569dc2cef66686dd50ceffabbedfe2 WHIRLPOOL 9333a4349a0ace2d227ed32437398d9b538c2e608ba3ae8584f3b37e656dbdbb9b9fbb40ac265949c7774443462305d7641d1ae5753749e2da71c1e97113a653
AUX calculate-update-3.2.0_alpha12-r5.patch 13550 SHA256 2e0738fb997f5aba5276ea50ddd66089c1136bdcab9db37b29dcd1995f60fd02 SHA512 3e0f259fe9b715f5d12b6515beda9680e694084dd1dae32180adc0e4bf948b39a81d269425a6e271017d9cf6c5c64e3109ab04ad403dc91f81847342d2c832b5 WHIRLPOOL 661a16fa19fe2006f04346349a16b4b7852da67ec305bbdb546192fc627d801cac6a2810682f3164e32d933479e0325c497a7c071983be2d170ce96f6a89ffae
AUX calculate-update-3.2.0_alpha12-r6.patch 19318 SHA256 c107a659a849873cbc6768d206ba26345ddd624332c0412892a3010a030536a7 SHA512 a84920ef18b8ed8be9bb9c595386ede28634a8f43aa0e7e3a7bbf83c9563ca278c4aa7a96e1537875d6dac2692e76232d751553bc161022d35eb0df181fd961a WHIRLPOOL 319967f4c61c6c4a12e1d1830a923f7f6b5c866b0c9ece910c42337d17a5fed6f8e9d9ff5a4884d94bffb98842b427ac3e1177c698f794c4a5a8a9ea65c19527
DIST calculate-update-3.1.9.tar.bz2 6767 SHA256 26e18cc55abfd73f37468adecb0028a50e05feba080bf3a21df8b62314adaa5d SHA512 14c5d86c990285cf39c7542d792205631106a4b53cd243297ec7f8e1a074c6c4c85f389a15152da5a6405e5a5b340bb75ad59af81b9d9004002daf53762035ce WHIRLPOOL 9740c28bb439799b85b92c69a1dfa7656570340b6032d7ace3bf136777f2c6e156b8f4c4fb12c68108d57027ad1ce2c83713432c4cc71dfeee3f9e33714a6cee
DIST calculate-update-3.2.0_alpha11.tar.bz2 26372 SHA256 22e73eb2f14454a4812798715ba48ab342f6b842a41b712b6a73cf1740d132ff SHA512 6ee6dea6b977b627786e4bc84718119215d661e5bc07328c56d3b969c5b9c7a6fbe29ac2ab044e15007fac8136c65376a7fadd06e8407bdd280c97e18fd7a590 WHIRLPOOL 430ad743fbad00be523fd8b83fd9fcc6e0023130adacc99b1f4a6f9be8fa542cefa904b4989c4d72f268363298c6891898b99f7eeb59257ad1888d4da5b18dda
DIST calculate-update-3.2.0_alpha12.tar.bz2 30602 SHA256 844992174f7a78a0948ef3848c35bd9c07103280529fc70177b652485c751e5e SHA512 5a549639f14447c4d63b6666bdb7ccec23bb03bbe3aae0dcd543a204d5fc4180bfd2a89c74c3d0e32a0b0f7d34a228aec3dc839f6f1997bea24dd6d6ad7010af WHIRLPOOL f75c1c581ffb92eacdeba4a12e4aaa4c6383591afaed65dc39e30aa1ad405533716957e9257637df2986ccdd72cf545263d0b3bceccdcfb31cd0d9f176b7ff06
@ -20,6 +21,7 @@ EBUILD calculate-update-3.2.0_alpha12-r2.ebuild 887 SHA256 92d7df33b871ee34c0a3f
EBUILD calculate-update-3.2.0_alpha12-r3.ebuild 887 SHA256 f4bd6ed5fa3ab870768de99779e45db95441b2dde104e484b6868f999c4782a1 SHA512 c0393618a6321951e28d57a34291f10667885d69e9520a3f44a602af83d1a29a71f0a5d112e381591523e9b794f947d49755257bcacde2b024b1e4724ce861f7 WHIRLPOOL 3a8d456f275937ca961b79771007dc7b61290501a8cd0b05441078544e11fd306e8aa67a80b4bd653583e64459665cd9bf3c050457d29beac8a203db18455ac8
EBUILD calculate-update-3.2.0_alpha12-r4.ebuild 887 SHA256 f4499648ba9c7f0a817938d8a93e494844763e071c244cfa08c1b1155bbd7541 SHA512 2059996096ad49f906fa016ab5baa30d4df1cde2f1865e6955ebde8c63800e64885d4325e3ba22922ce33bd04007807520a2821a95fcca9f6b6041cf5a498824 WHIRLPOOL df5ab24bc1d38827704556421680d7e0bdd9c31664e51433b4baf89748fcde650ef29d017b622832b3dc9aa575a357cd56d9a2afb038dae81240ae017cf171ee
EBUILD calculate-update-3.2.0_alpha12-r5.ebuild 887 SHA256 6ce034f404281c1debe10b35b36b47d73927243c570931aefdc91c7713ff53c4 SHA512 2d8f60a8da80f9c93450b0171ab6f0c415761ec6289b44ad71e5ba55440544fb776caa4f99d5366318768e6cb0b7edb62bd7cfbb1c7fa72f50ea901e5fe6b0b4 WHIRLPOOL 42ec880ff8890ad4bc32a6a5afd7c03fa2be83897968f97f310534eca3cb496ba3d3473a7ed9b34704e444afd5ac30ac30cf82feda3e8bfd4f1ac3e36b3e5c7b
EBUILD calculate-update-3.2.0_alpha12-r6.ebuild 887 SHA256 a40e0117cbd1fcf7b7fa085286e8d95434261f03ed0a0e8901719b1208d1af21 SHA512 b1493544962b9df6eb2b62cd10bea25c188278b7acd2586117ca3e19d42d0cc76299dbaea2ac8b12486a34e600499970b470617a81642e0440006a341ff797b3 WHIRLPOOL f9665751cd5e264360ea79cfc60d10f9a897a397e7802da77a4461f405a070bda086edaf1127883ef14e280e779619ff4ef01bed39ef6defc59444107214473b
EBUILD calculate-update-3.2.0_alpha12.ebuild 625 SHA256 c1ac759c531edac5191a88a24a529c06f74f28de2d0ecf9aa0a73577c0b8a714 SHA512 f6aeef23e550431c96daaad86881804808fffe93aa379fafe98ea670c5c63fa5e3e90a8ce44429f37a7ef5906f06331f22dc98db20aeee2b4017c7f87f33435f WHIRLPOOL 9cd763634045340baa9b3bc472c432901fac7cf3f15abc43f23b5de21d0ebcc85db0befeb0595dd09ba7e7b39b2d4568e6a7173888fab5527231eafc716b57e6
EBUILD calculate-update-3.2.9999.ebuild 520 SHA256 13be99f26482c5ef9097b758b66c25024df1850963b1c7dbacab71bd50ea4815 SHA512 7b077570676855b0cc3fa87ec329f14d2a94cf90bebab80ab03e9b0711f21fa7c578e8c063d05bc07e32031b48c342523a2344f06face54af455d885a9a8836a WHIRLPOOL 8443a7028edec83ccd6a870116b5fadc1b22e668e0df179bed9e4be06307f0c37834eed788e5ae620d619e6a6ca1dc09ed75fccd6cd0e4e46c77f480077189af
MISC metadata.xml 274 SHA256 90e473fd86cfea0413c6716c7dbbf79b686276fcd1ebe41e5ce60116335f825c SHA512 81d626411cde5b4f6d3fba8f9848e11aa981a0b300eae59f0a473738b2612b2c356d7c3933cee6c2e15f09515c0be39bc6a3175a877fe318f39a704540516588 WHIRLPOOL 90b28551a43fda86643748748b25743df29d292b865b0a8ad338f4386eae7dc5232b54d539c286c4a7004fb194f783450441fdf09654739962da4d1cf7725bae

@ -0,0 +1,38 @@
# 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_alpha12
~sys-apps/calculate-install-3.2.0_alpha12
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_alpha12-r6.patch"
}

@ -0,0 +1,445 @@
diff --git update/emerge_parser.py update/emerge_parser.py
index a9064c6..33d5699 100644
--- update/emerge_parser.py
+++ update/emerge_parser.py
@@ -102,12 +102,21 @@ class EmergeCommand(CommandExecutor):
cmd = getProgPath("/usr/bin/emerge")
def __init__(self, packages, extra_params=None, env=None, cwd=None,
- logfile=None):
+ logfile=None, emerge_default_opts=None):
extra_params = extra_params or []
self.child = None
self.packages = packages
self.params = self.default_params + extra_params
- default_env = {'CLEAN_DELAY': '0'}
+ wrong_default_opts = ("--columns","--ask ", "--ask=")
+ if emerge_default_opts is None:
+ default_env = {'CLEAN_DELAY': '0'}
+ else:
+ default_env = {
+ 'CLEAN_DELAY': '0',
+ 'EMERGE_DEFAULT_OPTS': " ".join(filter(
+ lambda x: not any(y in x for y in wrong_default_opts),
+ emerge_default_opts))
+ }
default_env.update(os.environ)
self.env = env or default_env
self.cwd = cwd
diff --git update/profile.py update/profile.py
index 524be5d..aa28782 100644
--- update/profile.py
+++ update/profile.py
@@ -176,7 +176,7 @@ class ProfileRepository(object):
shutil.move(self.directory, newpath)
self._storage = storage
except OSError as e:
- raise UpdateError(_("Failed to move profile: %s") %
+ raise UpdateError(_("Failed to move the profile: %s") %
str(e))
@classmethod
@@ -230,7 +230,9 @@ class ProfileRepository(object):
Синхронизировать репозиторий
"""
git = Git()
- git.pullRepository(self.directory)
+ if not git.pullRepository(self.directory, quiet_error=True):
+ git.resetRepository(self.directory, to_origin=True)
+ git.pullRepository(self.directory, quiet_error=True)
def get_profiles(self):
"""
diff --git update/update.py update/update.py
index 42031ff..9ffec82 100644
--- update/update.py
+++ update/update.py
@@ -32,12 +32,12 @@ import math
from package_tools import Git, Layman,\
EmergeLogNamedTask, EmergeLog, GitError, \
- PackageInformation, PackageList
+ PackageInformation, PackageList, EmergePackage
Colors = TextState.Colors
from calculate.lib.utils.files import (getProgPath, STDOUT, removeDir,
PercentProgress, process, getRunCommands,
- readFile)
+ readFile, listDirectory)
import emerge_parser
import logging
from emerge_parser import EmergeParser, EmergeCommand, EmergeError, EmergeCache
@@ -68,6 +68,7 @@ class Update:
self.emerge_cache.check_list +
map(emerge_parser.GitCheckvalue,
self.clVars.Get('update.cl_update_rep_path')))
+ self.update_map = {}
def _syncRepository(self, name, url, rpath, revision, branch,
cb_progress=None):
@@ -135,17 +136,18 @@ class Update:
time.sleep(random.random()*3)
self.endTask()
- emerge_running = lambda: any("/usr/bin/emerge" in x
- for x in getRunCommands())
- if emerge_running():
- if not wait_update:
- raise UpdateError(_("Emerge is running. "
- "Try to run later."))
- else:
- self.startTask(_("Waiting for emerge to be complete"))
- while emerge_running():
- time.sleep(1)
- self.endTask()
+ if self.clVars.Get('cl_chroot_status') == 'off':
+ emerge_running = lambda: any("/usr/bin/emerge" in x
+ for x in getRunCommands(True))
+ if emerge_running():
+ if not wait_update:
+ raise UpdateError(_("Emerge is running. "
+ "Try to run later."))
+ else:
+ self.startTask(_("Waiting for emerge to be complete"))
+ while emerge_running():
+ time.sleep(1)
+ self.endTask()
return True
def syncRepositories(self, repname, clean_on_error=True):
@@ -316,16 +318,26 @@ class Update:
_print = self.color_print
one = _print("{0}", num)
two = _print("{0}", max_num)
- part = _(" ({current} of {maximum})").format(current=one,
+ part = _("({current} of {maximum})").format(current=one,
maximum=two)
+ _print = _print.foreground(Colors.DEFAULT)
if self.is_binary_pkg(pkg,binary):
- _print = _print.foreground(Colors.PURPLE)
+ _colorprint = _print.foreground(Colors.PURPLE)
else:
- _print = _print.foreground(Colors.GREEN)
-
+ _colorprint = _print.foreground(Colors.GREEN)
+
+ PackageInformation.add_info(pkg)
+ name = ""
+ if pkg.info['DESCRIPTION']:
+ name = _(pkg.info['DESCRIPTION'])
+ name = name[:1].upper() + name[1:]
+ if not name:
+ name = str(pkg)
+
+ self.printSUCCESS(
+ _("{part} {package}").format(part=part, package=name))
self.startTask(
- _("Emerging{part} {package}").format(part=part,
- package=_print(str(pkg))))
+ _("Emerging {package}").format(package=_colorprint(str(pkg))))
def _printInstallPackage(self, pkg, binary=False):
"""
@@ -337,8 +349,14 @@ class Update:
_print = _print.foreground(Colors.PURPLE)
else:
_print = _print.foreground(Colors.GREEN)
- self.startTask(_("Installing %s") %
- _print(str(pkg)))
+ #print listDirectory('/var/db/pkg/%s' % pkg['CATEGORY'])
+ pkg_key = "{CATEGORY}/{PF}".format(**pkg)
+ if pkg_key in self.update_map:
+ self.startTask(_("Installing {pkg} [{oldver}]").format(
+ pkg=_print(str(pkg)), oldver=self.update_map[ pkg_key]))
+ else:
+ self.startTask(_("Installing %s") % (_print(str(pkg))))
+
def _printFetching(self, fn):
"""
@@ -516,6 +534,7 @@ class Update:
"""
Вывести информацию об обновлении
"""
+ deo = self.clVars.Get('cl_emerge_default_opts')
param, packages = self.getCacheOnWorld(param, packages, check=True)
param = [param, "-pv"]
@@ -523,8 +542,8 @@ class Update:
self.printSUCCESS(_("Installed packages are up to date"))
self.set_need_update(False)
return True
- with EmergeParser(EmergeCommand(list(packages),
- extra_params=param)) as emerge:
+ with EmergeParser(EmergeCommand(list(packages), emerge_default_opts=deo,
+ extra_params=param)) as emerge:
try:
emerge.run()
if "@world" in packages:
@@ -580,6 +599,12 @@ class Update:
"""
Настроить и выполнить emerge
"""
+ if emerge.install_packages and emerge.install_packages.list:
+ for pkg in emerge.install_packages.list:
+ rv = pkg.get('REPLACING_VERSIONS', '')
+ if rv:
+ self.update_map["{CATEGORY}/{PF}".format(**pkg)] = \
+ rv.partition(":")[0]
emerge.command.send("yes\n")
emerge.emerging.add_observer(self._printEmergePackage)
emerge.installing.add_observer(self._printInstallPackage)
@@ -600,6 +625,7 @@ class Update:
"""
Выполнить сборку пакета
"""
+ deo = self.clVars.Get('cl_emerge_default_opts')
if not packages:
packages = [param]
extra_params = None
@@ -608,7 +634,7 @@ class Update:
if not packages:
return True
extra_params = [param]
- with EmergeParser(EmergeCommand(list(packages),
+ with EmergeParser(EmergeCommand(list(packages), emerge_default_opts=deo,
extra_params=extra_params)) as emerge:
try:
emerge.question.action = lambda x: False
@@ -626,7 +652,9 @@ class Update:
"""
Выполнить очистку системы от лишних пакетов
"""
- with EmergeParser(EmergeCommand(["--depclean"])) as emerge:
+ deo = self.clVars.Get('cl_emerge_default_opts')
+ with EmergeParser(EmergeCommand(["--depclean"],
+ emerge_default_opts=deo)) as emerge:
try:
emerge.question.action = lambda x: False
emerge.run()
@@ -704,5 +732,5 @@ class Update:
os.unlink(rm_fn)
os.symlink(profile_path, '/etc/portage/make.profile')
except (OSError,IOError) as e:
- raise UpdateError(_("Failed to set profile: %s")%str(e))
+ raise UpdateError(_("Failed to set the profile: %s")%str(e))
return True
diff --git update/utils/cl_update_profile.py update/utils/cl_update_profile.py
index 045b92c..20121a1 100644
--- update/utils/cl_update_profile.py
+++ update/utils/cl_update_profile.py
@@ -32,9 +32,9 @@ class ClUpdateProfileAction(Action):
# ошибки, которые отображаются без подробностей
native_error = (FilesError, UpdateError, GitError)
- successMessage = __("Update profile successed")
- failedMessage = __("Update profile failed")
- interruptMessage = __("Update profile manually interrupted")
+ successMessage = __("The profile was successfully updated")
+ failedMessage = __("Failed to update the profile")
+ interruptMessage = __("Profile update manually interrupted")
# список задач для дейсвия
@@ -99,10 +99,10 @@ class ClUpdateProfileAction(Action):
]
},
{'name': 'reps_synchronization',
- 'group': __("Setting up profile"),
+ 'group': __("Setting up the profile"),
'tasks': [
{'name': 'set_profile',
- 'message': __("Switching to {cl_update_profile_system} profile"),
+ 'message': __("Switching to profile {cl_update_profile_system}"),
'method': 'Update.setProfile()'
},
]
diff --git update/variables/update.py update/variables/update.py
index 6ce3896..c6b891c 100644
--- update/variables/update.py
+++ update/variables/update.py
@@ -31,10 +31,10 @@ from calculate.update.package_tools import Git, GitError, Layman
from calculate.update.profile import RepositoryStorageSet, DEFAULT_BRANCH
from calculate.lib.variables.linux import VariableOsLinuxName, \
- VariableOsLinuxSubname, VariableOsLinuxVer
+ VariableOsLinuxSubname, VariableOsLinuxVer, VariableOsLinuxShortname
-setLocalTranslate('cl_update3',sys.modules[__name__])
+setLocalTranslate('cl_update3', sys.modules[__name__])
class VariableAcUpdateSync(ReadonlyVariable):
"""
@@ -458,7 +458,7 @@ class VariableClUpdateProfileLinuxFullname(ReadonlyVariable):
Имя системы в профиле
"""
def init(self):
- self.label = _("Profile system name")
+ self.label = _("Distribution name")
def get(self):
dv = self.Get('cl_update_profile_datavars')
@@ -466,9 +466,10 @@ class VariableClUpdateProfileLinuxFullname(ReadonlyVariable):
try:
subname = dv.Get('os_linux_subname')
linuxname = dv.Get('os_linux_name')
+ linuxver = dv.Get('os_linux_ver')
if subname:
- return "%s %s" % (linuxname, subname)
- return linuxname
+ return "%s %s %s" % (linuxname, linuxver, subname)
+ return "%s %s" %(linuxname,linuxver)
except DataVarsError:
raise VariableError("Wrong Calculate Linux profile")
return ""
@@ -548,7 +549,7 @@ class VariableClUpdateProfileLinuxVer(ReadonlyVariable):
Имя системы в профиле
"""
def init(self):
- self.label = _("Profile system version")
+ self.label = _("System profile version")
def get(self):
dv = self.Get('cl_update_profile_datavars')
@@ -577,7 +578,7 @@ class VariableClUpdateProfileRep(Variable):
def init(self):
self.label = _("Profile repository")
- self.help = _("set profile repository")
+ self.help = _("set the profile repository")
re_url = re.compile(
r"^(?:(%s)://)?(\w[\w\./:-]+?\w)(\.git)?$" % "|".join(
@@ -589,7 +590,7 @@ class VariableClUpdateProfileRep(Variable):
def normalize_url(cls, url):
match = cls.re_url.match(url)
if not match:
- raise VariableError(_("Failed repository url"))
+ raise VariableError(_("Wrong repository URL"))
url = match.group(2)
url = "%s://%s" % (match.group(1) or "git", url)
url = "%s.git" % url
@@ -606,12 +607,12 @@ class VariableClUpdateProfileRep(Variable):
where='cl_update_rep_host',
eq=match.group(1), limit=1)
if not template:
- raise VariableError(_("Failed to determine repository host"))
+ raise VariableError(_("Failed to determine the repository host"))
try:
return template % match.group(2)
except TypeError:
- raise VariableError(_("Failed to determine repository host"))
+ raise VariableError(_("Failed to determine the repository host"))
def set(self, value):
if self.re_shortname.match(value):
@@ -627,7 +628,7 @@ class VariableClUpdateProfileRep(Variable):
except GitError as e:
raise VariableError(str(e))
if not self.Get('cl_profile_shortname'):
- raise VariableError(_("Repository %s has not profiles")%value)
+ raise VariableError(_("Repository %s has no profiles")%value)
def get(self):
try:
@@ -665,7 +666,7 @@ class VariableClUpdateProfileBranch(Variable):
def init(self):
self.label = _("Repository branch")
- self.help = _("set repository branch")
+ self.help = _("set the repository branch")
def check(self, value):
pass
@@ -714,8 +715,10 @@ class VariableClProfileData(ReadonlyTableVariable):
try:
rep_set = self.Get('cl_update_profile_storage')
branch = self.Get('cl_update_profile_branch')
- profiles = rep_set.get_profiles(url, branch)
rep = rep_set.get_repository(url, branch)
+ if rep and self.Get('cl_update_profile_sync_set') == 'on':
+ rep.sync()
+ profiles = rep_set.get_profiles(url, branch)
except GitError:
return [[]]
arch = self.Get('os_arch_machine_gentoo')
@@ -779,11 +782,11 @@ class VariableClUpdateProfileSystem(Variable):
def init(self):
self.label = _("System profile")
- self.help = _("set system profile")
+ self.help = _("set the system profile")
def check(self, profile):
if not profile:
- raise VariableError(_("Profile must be specified"))
+ raise VariableError(_("You must specify the profile"))
path_profile = self.Select('cl_profile_path',
where='cl_profile_shortname',
eq=profile, limit=1)
@@ -792,8 +795,8 @@ class VariableClUpdateProfileSystem(Variable):
try:
if (not dv.Get('cl_update_rep_name') or
not dv.Get('cl_update_rep_url')):
- raise VariableError(_("Repository variables is not "
- "configured in profile"))
+ raise VariableError(_("Repository variables "
+ "were not configured for the profile"))
if not dv.Get('os_linux_name'):
raise VariableError()
except (DataVarsError, VariableError) as e:
@@ -841,6 +844,7 @@ class DataVarsUpdateProfile(SimpleDataVars):
def __init__(self, profile):
SimpleDataVars.__init__(self,
VariableOsLinuxName(),
+ VariableOsLinuxShortname(),
VariableOsLinuxSubname(),
VariableOsLinuxVer(),
VariableClUpdateRepData(section="update"),
@@ -857,3 +861,15 @@ class DataVarsUpdateProfile(SimpleDataVars):
def __repr__(self):
return "Profile variables"
+
+class VariableClUpdateProfileSyncSet(Variable):
+ """
+ Не выполнять установку/обновление пакетов при обновлении
+ """
+ type = "bool"
+ value = "off"
+ opt = ["-s", "--sync"]
+
+ def init(self):
+ self.label = _("Synchronize repositories")
+ self.help = _("synchronize repositories")
diff --git update/wsdl_update.py update/wsdl_update.py
index 9563c11..5e8d36e 100644
--- update/wsdl_update.py
+++ update/wsdl_update.py
@@ -106,18 +106,18 @@ class Wsdl(WsdlBase):
# описание груп (список лямбда функций)
'groups': [
lambda group: group(_("Repository"),
- brief=('cl_update_profile_repo_name',
- 'cl_update_profile_branch'),
- hide=("cl_update_profile_rep",),
+ brief=('cl_update_profile_repo_name',),
+ hide=('cl_update_profile_rep',
+ 'cl_update_profile_sync_set'),
normal=('cl_update_profile_rep',),
- expert=('cl_update_profile_branch',)),
+ expert=('cl_update_profile_branch',
+ 'cl_update_profile_sync_set')),
lambda group: group(_("Profile"),
normal=('cl_update_profile_system',),
brief=('cl_update_profile_system',
'cl_update_profile_linux_fullname',
- 'cl_update_profile_linux_ver',
'cl_update_profile_depend_data')
)],
'brief': {'next': __("Perform"),
- 'name': __("Set profile")}},
+ 'name': __("Set the profile")}},
]

@ -10,6 +10,7 @@ EBUILD calculate-utilities-3.2.0_alpha11-r6.ebuild 842 SHA256 7a922913fd6efc3100
EBUILD calculate-utilities-3.2.0_alpha11-r7.ebuild 842 SHA256 f4d07fa28a59b0d2ef0749bfe2c9087b1ddc09a9c520f37b214f1bfe2022915b SHA512 e89fb97b5fd8e714ce50046b801c12a1772c9527e7f316384dcd9951425dd09e3afbfdb620d056af1388af8b838c1696dcbb902cc919a41586d3ebc4effd9210 WHIRLPOOL 4ee1e1cc0700a922f26d9ada9491accef9e44592a6df871e1f8e0885c00ada81cb2cff8279580408b8ccbbf05c1d1c2293cd436ca0583bcf8d07c228a5fa248f
EBUILD calculate-utilities-3.2.0_alpha11-r8.ebuild 842 SHA256 f7e97ca3bb4a0a3e36145bd48392606a5104690f6f0c6c53532607bb240c8d62 SHA512 417fec3259c0f059c17b4cb4c69f1f887ff3f7dd40a39a24aa31bee4c221032f0a05f6e0c5c9f77f35a1460173934828b28b0dbbdd69f6ba8c51d6b4c542f46c WHIRLPOOL ee5cf6564fc3a1a70113034d48a670ddd5667a44c0f12c134d746fb245f6651a32a57ade3fbc0b6d9a4290f4691bea46df7f3e735c5388737c69b94bd24c9f0a
EBUILD calculate-utilities-3.2.0_alpha12-r1.ebuild 827 SHA256 3b3233abbc94b397e48273dfce93c209d6c8c28dff8a4796d0b1aea35b7a72f4 SHA512 dc148b51a507a9bcc7850516575ac4d9ea48a7e9302fc6f9fbb594a77f8a24db0da442bf54f546e4205b63044cc7da66a9214bf9e1f35f2bee37191a97bb7c3e WHIRLPOOL d317fa2a59f2de7dc5357771a2c3439e1face554932f4911f1d00f06653e1fa8abc3373f2f802236e7342a6eba43b28305277c0bdf535cfab4f0cba70ce281a8
EBUILD calculate-utilities-3.2.0_alpha12-r10.ebuild 836 SHA256 cb980b3810aafb70b7f369275f5593b502df355488e2e179abd86eb18ddc60d6 SHA512 1bece5a1a210e267aff0777be449c3b007b40889348800b709b90e54721a1a76cd9313427bd0ae40f7a9b6cecf16c7582fc9fc97b14e0c4a4729b5b8c364d3d7 WHIRLPOOL 7ca0cb851348ce05fb61ea3b1a8f12176922b7292c381947f848ec9eb6d62bc0f23b8c42ec5d7aeb0d0c552532398499880f015a676d5d483812d0c2a53a0768
EBUILD calculate-utilities-3.2.0_alpha12-r2.ebuild 827 SHA256 e8eaa0f268f9ed8b752203798ae965c1655640ea8e2325256a56b5168fdca897 SHA512 c316b5b58a92c1818567241fda9e1283273d86960aebd20166bb1238e124bcafa2c9138063b7d04befe29d1f0356752a19bae08538b55033b9ad5aa86b91a701 WHIRLPOOL 59553146f41539a1b2222776538ec36bafe0de7a6680d8ae863667c10ef1953ce63651b829bfdddc5c8e5e23ad199d2fc2da5ae5ba164796fe60cca53edae4b4
EBUILD calculate-utilities-3.2.0_alpha12-r3.ebuild 830 SHA256 4d3cb2ff71b803b053041e2eb413ae1d689e646b6dbd4734e37d642c9fba2a51 SHA512 6e5c4b99ad5e90203685c9b8d2763bcdd37135fc8397e828e0ea8d800332cd26714b890d411208c112f09ef62eb926d7c536631529eadf8f185b1279175f980d WHIRLPOOL 71c7fcc869c3f5518640368fdf39b39176f6c19d75a34f38c98f87dd1ea37cbb739b5309e6da366322d50b8353aff2b103d2b4d268c52f0dedf6d9a5187f9b39
EBUILD calculate-utilities-3.2.0_alpha12-r4.ebuild 830 SHA256 c76b50f6ee84f2a8ec4f7e434d1b647229f79d8204d68cc2f00d95bfa002183f SHA512 4b20244c3f858e0ffa63dd2517e98cae8030201cfd785478c9858dde1327cccebabb2199d4a7432af17221b8c9179aad408fd2b1ed028ed052be6f6cb574f903 WHIRLPOOL 78319b0994ce04051b090adc888291e0190bbf82d28b7f0fe1280864d71f206ea951ca3a1a55e51154c842be5b3b73d214d7be2cbf5ba3debc1302acfc0ed4fe

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