From 60836643aa6355b4b6269434248cbc34ed9cc10a Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Thu, 27 Aug 2020 10:10:23 -0300 Subject: [PATCH] [arch] fix -> AUR: some packages dependencies cannot be downloaded due to the wrong download URL --- CHANGELOG.md | 1 + bauh/gems/arch/aur.py | 5 +++-- bauh/gems/arch/updates.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 093f7333..3737e3e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,6 +76,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - multi-threaded download: not retrieving correctly some source files URLs (e.g: linux-xanmod-lts) - importing PGP keys (Generic error). Now the key server is specified: `gpg --keyserver SERVER --recv-key KEYID` (the server address is retrieved from [bauh-files](https://github.com/vinifmor/bauh-files/blob/master/arch/gpgservers.txt)) - not installing the correct package built when several are generated (e.g: linux-xanmod-lts) + - some packages dependencies cannot be downloaded due to the wrong download URL (missing the 'pkgbase' field to determine the proper url) - some environment variables are not available during the common operations (install, upgrade, downgrade, uninstall, makepkg, launch) - Flatpak - downgrading crashing with version 1.8.X diff --git a/bauh/gems/arch/aur.py b/bauh/gems/arch/aur.py index f6678c8b..7e4cd493 100644 --- a/bauh/gems/arch/aur.py +++ b/bauh/gems/arch/aur.py @@ -210,12 +210,13 @@ class AURClient: provided.update(info.get('provides')) return {'c': info.get('conflicts'), 's': None, 'p': provided, 'r': 'aur', - 'v': info['pkgver'], 'd': self.extract_required_dependencies(info)} + 'v': info['pkgver'], 'd': self.extract_required_dependencies(info), + 'b': info.get('pkgbase', pkgname)} else: if latest_version: provided.add('{}={}'.format(pkgname, latest_version)) - return {'c': None, 's': None, 'p': provided, 'r': 'aur', 'v': latest_version, 'd': set()} + return {'c': None, 's': None, 'p': provided, 'r': 'aur', 'v': latest_version, 'd': set(), 'b': pkgname} def fill_update_data(self, output: Dict[str, dict], pkgname: str, latest_version: str, srcinfo: dict = None): data = self.map_update_data(pkgname=pkgname, latest_version=latest_version, srcinfo=srcinfo) diff --git a/bauh/gems/arch/updates.py b/bauh/gems/arch/updates.py index 66cebfce..b00bc55b 100644 --- a/bauh/gems/arch/updates.py +++ b/bauh/gems/arch/updates.py @@ -241,7 +241,7 @@ class UpdatesSummarizer: for idx, dep in enumerate(deps): data = deps_data[dep[0]] - pkg = ArchPackage(name=dep[0], version=data['v'], latest_version=data['v'], repository=dep[1], i18n=self.i18n) + pkg = ArchPackage(name=dep[0], version=data['v'], latest_version=data['v'], repository=dep[1], i18n=self.i18n, package_base=data.get('b', dep[0])) sorted_pkgs[idx] = pkg context.to_install[dep[0]] = pkg