From 9f988d3bbe62baea44812960a60045d17a509274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 23 Dec 2015 11:42:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20eix-update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/update/utils/cl_update.py | 3 ++- pym/update/utils/cl_update_profile.py | 3 ++- pym/update/variables/update.py | 12 ++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pym/update/utils/cl_update.py b/pym/update/utils/cl_update.py index 3667c59..355cc57 100644 --- a/pym/update/utils/cl_update.py +++ b/pym/update/utils/cl_update.py @@ -254,7 +254,8 @@ class ClUpdateAction(Action): Get('cl_update_metadata_force') == 'force')) }, {'name': 'eix_update', - 'message': __("Updating the eix cache for {cl_repository_name}"), + 'message': __("Updating the eix cache for " + "{cl_update_eix_repositories}"), 'method': 'Update.eixUpdate(cl_repository_name)', 'condition': ( lambda Get: (Get('cl_update_outdate_set') == 'on' and diff --git a/pym/update/utils/cl_update_profile.py b/pym/update/utils/cl_update_profile.py index 137657c..942feb5 100644 --- a/pym/update/utils/cl_update_profile.py +++ b/pym/update/utils/cl_update_profile.py @@ -92,7 +92,8 @@ class ClUpdateProfileAction(Action): Get('cl_update_metadata_force') == 'force')) }, {'name': 'eix_update', - 'message': __("Updating the eix cache for {cl_repository_name}"), + 'message': __("Updating the eix cache for " + "{cl_update_eix_repositories}"), 'method': 'Update.eixUpdate(cl_repository_name)', 'condition': ( lambda Get: (Get('cl_update_outdate_set') == 'on' and diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py index e3d8636..efdc582 100644 --- a/pym/update/variables/update.py +++ b/pym/update/variables/update.py @@ -39,6 +39,7 @@ from ..profile import (RepositoryStorageSet, DEFAULT_BRANCH, from calculate.lib.variables import linux as lib_linux from calculate.lib.variables import env from calculate.update.update_info import UpdateInfo +from itertools import chain import time _ = lambda x: x @@ -1561,3 +1562,14 @@ class VariableClUpdateOnedepthSet(Variable): def init(self): self.label = _("Clear the history of repositories") self.help = _("clear the history of repositories") + + +class VariableClUpdateEixRepositories(ReadonlyVariable): + """ + Отображаемый список обновляемых репозиториев eix + """ + def get(self): + return ", ".join( + x for x in chain( + reversed(self.Get('update.cl_update_rep_name')), + self.Get('update.cl_update_other_rep_name')))