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

[fix][arch] checking mapped data during mutual conflict checking

Browse Source
This commit is contained in:
Vinicius Moreira
2020-04-28 18:06:25 -03:00
parent f60c68de31
commit f860be1b07
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bauh/gems/arch/updates.py
View File

@@ -163,14 +163,15 @@ class UpdatesSummarizer:
else: else:
self._handle_conflict_both_to_update(pkg1, pkg2, context) # adding both to the 'cannot update' list 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 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 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] del context.pkgs_data[p]
return root_conflict return root_conflict