Исправлен двойной вывод сообщения о том, что сервер не найден

legacy27 3.6.0_beta12
parent 13cd521646
commit d275ed169a

@ -1308,7 +1308,7 @@ class Update(MethodsInterface):
self.clVars.Get("update.cl_update_portage_binhost_path")) self.clVars.Get("update.cl_update_portage_binhost_path"))
if path.exists(binhost_fn): if path.exists(binhost_fn):
os.unlink(binhost_fn) os.unlink(binhost_fn)
return True return False
def update_binhost_list(self, dv=None): def update_binhost_list(self, dv=None):
""" """

@ -57,10 +57,6 @@ def get_synchronization_tasks(object_name):
Get('update.cl_update_sync_rep') and Get('update.cl_update_sync_rep') and
Get('update.cl_update_binhost')) Get('update.cl_update_binhost'))
}, },
{'name': 'not_use_search:failed_base_binhost',
'error': __("Failed to use base binhost"),
'depend': AllTasks.failed_all("check_current_binhost")
},
{'name': 'group_find_binhost', {'name': 'group_find_binhost',
'group': '', 'group': '',
'while': (~AllTasks.has_any("detect_best_binhost") & 'while': (~AllTasks.has_any("detect_best_binhost") &
@ -125,12 +121,17 @@ def get_synchronization_tasks(object_name):
}, },
], ],
}, },
{'name': 'not_use_search:failed_base_binhost',
'error': __("Failed to use base binhost"),
'method': Object("delete_binhost()"),
'depend': AllTasks.failed_all("check_current_binhost")
},
{'name': 'no_server', {'name': 'no_server',
'error': __("Failed to find the binary updates server"), 'error': __("Failed to find the binary updates server"),
'method': Object("delete_binhost()"), 'method': Object("delete_binhost()"),
# method: который должен удалить текущую информацию о сервере обновлений # method: который должен удалить текущую информацию о сервере обновлений
'depend': (Tasks.failed() | 'depend': (~Tasks.has_any("failed_base_binhost") & (Tasks.failed() |
Tasks.success() & AllTasks.failed_one_of("update_packages_cache")), Tasks.success() & AllTasks.failed_one_of("update_packages_cache"))),
'condition': lambda GetBool, Get: (GetBool('update.cl_update_usetag_set') and 'condition': lambda GetBool, Get: (GetBool('update.cl_update_usetag_set') and
Get('update.cl_update_sync_rep')), Get('update.cl_update_sync_rep')),
}, },

Loading…
Cancel
Save