From 9aad9102be58a6c1c86596c429f3c90cc849c63c Mon Sep 17 00:00:00 2001 From: root Date: Tue, 22 Nov 2022 14:51:48 +0300 Subject: [PATCH] Fix: cl-update-profile --- pym/update/update.py | 2 +- pym/update/utils/cl_update.py | 3 ++- pym/update/variables/update.py | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pym/update/update.py b/pym/update/update.py index 32ab318..238543e 100644 --- a/pym/update/update.py +++ b/pym/update/update.py @@ -1846,7 +1846,7 @@ class Update(MethodsInterface): self.clVars.Set('update.cl_update_binhost_data', retval or Variable.EmptyTable, force=True) if not ignore_level: - best_binhost_level = int(self.clVars.Get("update.cl_update_binhost_level")[0]) + best_binhost_level = int(self.clVars.Get("update.cl_update_binhost_level")[0]) or None #int(sorted(self.clVars.Get("update.cl_update_binhost_level"), key=int)[-1]) # int(self.clVars.Get("update.cl_update_binhost_level")[0]) diff --git a/pym/update/utils/cl_update.py b/pym/update/utils/cl_update.py index 5e8b14c..ade3a38 100644 --- a/pym/update/utils/cl_update.py +++ b/pym/update/utils/cl_update.py @@ -84,7 +84,8 @@ def get_synchronization_tasks(object_name): 'depend': (Tasks.success() & ~AllTasks.has_any("not_use_search") & (~AllTasks.success_one_of("check_current_binhost") | AllTasks.success_all("sync_reps"))), - 'condition': lambda Get: Get('update.cl_update_use_migration_host') == 'off' + 'condition': lambda Get: Get('update.cl_update_use_migration_host') == 'off' and + not Get("update.cl_update_binhost_choice") }, {'name': 'interrupt_on_no_leveled_binhost', 'method': Object("interrupt_on_no_leveled_binhost()"), diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py index 4169628..277e4f3 100644 --- a/pym/update/variables/update.py +++ b/pym/update/variables/update.py @@ -640,6 +640,11 @@ class VariableClUpdateOtherSet(Variable): """ type = "bool" value = "on" + metavalue = _("Other overlays") + + def init(self): + self.label = _("Update other overlays") + self.help = _("Update other overlays") def get(self): if self.Get('cl_update_inner_other_set') != 'auto':