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

lock icon for the root password dialog

Browse Source
This commit is contained in:
Vinicius Moreira
2019-09-12 12:56:55 -03:00
parent 6c9098906d
commit 5a8a5e6cac
4 changed files with 155 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -428,7 +428,7 @@ class ArchManager(SoftwareManager):
self._update_progress(handler.watcher, 70, change_progress)
if check_install_output and 'conflict' in check_install_output[-1]:
conflicting_apps = [w[0] for w in re.findall(r'((\w|\-|\.)+)\s(and|are)', check_install_output[-1])]
conflict_msg = ' {} '.format(self.i18n['and']).join(conflicting_apps)
conflict_msg = ' {} '.format(self.i18n['and']).join([bold(c) for c in conflicting_apps])
if not handler.watcher.request_confirmation(title=self.i18n['arch.install.conflict.popup.title'],
body=self.i18n['arch.install.conflict.popup.body'].format(conflict_msg)):
handler.watcher.print(self.i18n['action.cancelled'])