From 231c77c7daf9fba53e07ee68f857ac65bb020e46 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Fri, 11 Sep 2020 11:39:28 -0300 Subject: [PATCH] [arch] fix -> wrong substatus when checking optdeps conflicts --- bauh/gems/arch/controller.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bauh/gems/arch/controller.py b/bauh/gems/arch/controller.py index eac27bed..a60472ac 100644 --- a/bauh/gems/arch/controller.py +++ b/bauh/gems/arch/controller.py @@ -1564,7 +1564,11 @@ class ArchManager(SoftwareManager): if repo_deps: repo_dep_names = [d[0] for d in repo_deps] - context.watcher.change_substatus(self.i18n['arch.checking.conflicts'].format(bold(context.name))) + + if context.dependency: + context.watcher.change_substatus(self.i18n['arch.substatus.conflicts']) + else: + context.watcher.change_substatus(self.i18n['arch.checking.conflicts'].format(bold(context.name))) all_provided = context.get_provided_map() @@ -1772,6 +1776,7 @@ class ArchManager(SoftwareManager): context.watcher.change_substatus(self.i18n['arch.optdeps.checking'].format(bold(context.name))) self._update_progress(context, 100) + if self._install_optdeps(context): return True @@ -2023,6 +2028,7 @@ class ArchManager(SoftwareManager): old_progress_behavior = context.change_progress context.change_progress = True + context.dependency = True deps_not_installed = self._install_deps(context, sorted_deps) context.change_progress = old_progress_behavior