From 11540cf1e7414087899353860a03b67f1f346472 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Mon, 17 Aug 2020 15:14:12 -0300 Subject: [PATCH] [arch] fix -> AUR: multi-threaded download: not retrieving correctly some source files URLs --- CHANGELOG.md | 4 +++- bauh/gems/arch/aur.py | 12 ++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea7f6f48..c251de9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,7 +55,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - not displaying all packages that must be uninstalled - displaying "required size" for packages that must be uninstalled - some conflict resolution scenarios when upgrading several packages - - AUR: info dialog of installed packages displays the latest PKGBUILD file instead of the one used for installation/upgrade/downgrade + - AUR: + - info dialog of installed packages displays the latest PKGBUILD file instead of the one used for installation/upgrade/downgrade (the fix will only work for new installed packages) + - multi-threaded download: not retrieving correctly some source files URLs (e.g: linux-xanmod-lts) - Flatpak - downgrading crashing with version 1.8.X - history: the top commit is returned as "(null)" in version 1.8.X diff --git a/bauh/gems/arch/aur.py b/bauh/gems/arch/aur.py index 8206e0b0..f6678c8b 100644 --- a/bauh/gems/arch/aur.py +++ b/bauh/gems/arch/aur.py @@ -52,10 +52,9 @@ def map_srcinfo(string: str, fields: Set[str] = None) -> dict: else: field_re = RE_SRCINFO_KEYS - for match in field_re.finditer(string): - field = RE_SPLIT_DEP.split(match.group(0)) - key = field[0].strip() - val = field[1].strip() + for tupl in field_re.findall(string): + key = tupl[0].strip() + val = tupl[1].strip() if key not in info: info[key] = [val] if key in KNOWN_LIST_FIELDS else val @@ -65,6 +64,11 @@ def map_srcinfo(string: str, fields: Set[str] = None) -> dict: info[key].append(val) + pkgname = info.get('pkgname') + + if isinstance(pkgname, list): + info['pkgname'] = pkgname[0] + return info