spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-08 16:44:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

[arch] fix -> wrong substatus when checking optdeps conflicts

Browse Source
This commit is contained in:
Vinicius Moreira
2020-09-11 11:39:28 -03:00
parent cd7984bc82
commit 231c77c7da
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bauh/gems/arch/controller.py
View File

@@ -1564,7 +1564,11 @@ class ArchManager(SoftwareManager):
if repo_deps: if repo_deps:
repo_dep_names = [d[0] for d in 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() 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))) context.watcher.change_substatus(self.i18n['arch.optdeps.checking'].format(bold(context.name)))
self._update_progress(context, 100) self._update_progress(context, 100)
if self._install_optdeps(context): if self._install_optdeps(context):
return True return True
@@ -2023,6 +2028,7 @@ class ArchManager(SoftwareManager):
old_progress_behavior = context.change_progress old_progress_behavior = context.change_progress
context.change_progress = True context.change_progress = True
context.dependency = True
deps_not_installed = self._install_deps(context, sorted_deps) deps_not_installed = self._install_deps(context, sorted_deps)
context.change_progress = old_progress_behavior context.change_progress = old_progress_behavior