From 82f140f2e1b6df1babc60c676cd68ac8c7f46486 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Mon, 24 Jan 2022 15:42:35 -0300 Subject: [PATCH] [arch] fix: not upgrading a package when a dependent package relies on a specific version with epoch --- CHANGELOG.md | 4 ++++ bauh/gems/arch/pacman.py | 12 ++---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 907fefd1..baaaa5f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [0.9.26] +### Fixes +- Arch + - not upgrading a package when a dependent package relies on a specific version with epoch (e.g: alsa-plugins 1:1.2.6-1 would not be upgraded to 1:1.2.6-2 because lib32-alsa-plugins relies on 1:1.2.6) + ### UI - new logo by [DN-debug](https://github.com/DN-debug) - new dark theme (**knight**) based on Kimi-dark gtk by [DN-debug](https://github.com/DN-debug) diff --git a/bauh/gems/arch/pacman.py b/bauh/gems/arch/pacman.py index c7f26168..7bda9593 100644 --- a/bauh/gems/arch/pacman.py +++ b/bauh/gems/arch/pacman.py @@ -882,22 +882,14 @@ def map_required_dependencies(*names: str) -> Dict[str, Set[str]]: deps = set() if val != 'None': - if ':' in val: - dep_info = val.split(':') - deps.add(dep_info[0].strip()) - else: - deps.update({dep.strip() for dep in val.split(' ') if dep}) + deps.update((dep for dep in val.split(' ') if dep)) elif latest_name and deps is not None: res[latest_name] = deps latest_name, deps, latest_field = None, None, None elif latest_name and deps is not None: - if ':' in l: - dep_info = l.split(':') - deps.add(dep_info[0].strip()) - else: - deps.update({dep.strip() for dep in l.split(' ') if dep}) + deps.update((dep for dep in l.split(' ') if dep)) return res