From f860be1b078d788076aba7339c12b8c89bb15af9 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Tue, 28 Apr 2020 18:06:25 -0300 Subject: [PATCH] [fix][arch] checking mapped data during mutual conflict checking --- bauh/gems/arch/updates.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bauh/gems/arch/updates.py b/bauh/gems/arch/updates.py index b2816844..7819b59c 100644 --- a/bauh/gems/arch/updates.py +++ b/bauh/gems/arch/updates.py @@ -163,14 +163,15 @@ class UpdatesSummarizer: else: self._handle_conflict_both_to_update(pkg1, pkg2, context) # adding both to the 'cannot update' list - for pkg1, pkg2 in mutual_conflicts.items(): # removing conflicting packages from the packages selected to update + for pkg1, pkg2 in mutual_conflicts.items(): # removing conflicting packages from the packages selected to upgrade for p in (pkg1, pkg2): - for c in context.pkgs_data[p]['c']: - # source = provided_map[c] - if c in root_conflict: - del root_conflict[c] - if p in context.pkgs_data: + if context.pkgs_data[p].get('c'): + for c in context.pkgs_data[p]['c']: + # source = provided_map[c] + if c in root_conflict: + del root_conflict[c] + del context.pkgs_data[p] return root_conflict