From 2cd55a701a08f15c1831085ec7045f52ce8e60b0 Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Wed, 10 Sep 2014 16:12:24 +0400 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20egencache=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=20=D0=BE=D0=BF=D1=86=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update/utils/cl_update.py | 4 ++-- update/variables/update.py | 24 ++++++++++++++++++++++++ update/wsdl_update.py | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/update/utils/cl_update.py b/update/utils/cl_update.py index f2fbae4..5204e61 100644 --- a/update/utils/cl_update.py +++ b/update/utils/cl_update.py @@ -239,8 +239,8 @@ class ClUpdateAction(Action): 'method': 'Update.regenCache(eachvar)', 'condition': ( lambda Get: (Get('cl_update_outdate_set') == 'on' and - Get('cl_update_metadata_force') != 'skip' or - Get('cl_update_metadata_force') == 'force')) + Get('cl_update_egencache_force') != 'skip' or + Get('cl_update_egencache_force') == 'force')) }, {'name': 'sync_other_reps:regen_other_cache', 'foreach': 'cl_update_other_rep_name', diff --git a/update/variables/update.py b/update/variables/update.py index 3c0e1ee..4b6cc47 100644 --- a/update/variables/update.py +++ b/update/variables/update.py @@ -293,6 +293,30 @@ class VariableClUpdateMetadataForce(Variable): ("skip", _("Skip")), ("auto", _("If needed"))] + +class VariableClUpdateEgencacheForce(Variable): + """ + Принудительное выполнение egencache + """ + type = "choice" + value = "auto" + opt = ["--egencache"] + syntax = "--{choice}-egencache" + metavalue = "MODE" + #untrusted = True + + def init(self): + self.help = ("'force' - " + _("force the update overlays cache") + + ",\n'skip' - " + _("skip the overlays cache update") + + ",\n'auto' - " + _("update overlays cache if it is outdated")) + self.label = _("Update overlays cache") + + def choice(self): + return [("force", _("Force")), + ("skip", _("Skip")), + ("auto", _("If needed"))] + + class VariableClUpdateEixupdateForce(Variable): """ Принудительное действие с eix-update diff --git a/update/wsdl_update.py b/update/wsdl_update.py index fea9c45..a3c726f 100644 --- a/update/wsdl_update.py +++ b/update/wsdl_update.py @@ -67,7 +67,7 @@ class Wsdl(WsdlBase): expert=( 'cl_rebuild_world_set', 'cl_update_rev_set', 'cl_update_sync_rep', 'cl_update_branch', - 'cl_update_metadata_force', + 'cl_update_egencache_force', 'cl_update_other_set', 'cl_update_pretend_set', 'cl_update_eixupdate_force',