spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-09 04:04:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

[arch] fix -> AUR: some packages dependencies cannot be downloaded due to the wrong download URL

Browse Source
This commit is contained in:
Vinicius Moreira
2020-08-27 10:10:23 -03:00
parent bb5abf5d86
commit 60836643aa
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -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) - 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)) - 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) - 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) - some environment variables are not available during the common operations (install, upgrade, downgrade, uninstall, makepkg, launch)
- Flatpak - Flatpak
- downgrading crashing with version 1.8.X - downgrading crashing with version 1.8.X

5
bauh/gems/arch/aur.py
View File

@@ -210,12 +210,13 @@ class AURClient:
provided.update(info.get('provides')) provided.update(info.get('provides'))
return {'c': info.get('conflicts'), 's': None, 'p': provided, 'r': 'aur', 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: else:
if latest_version: if latest_version:
provided.add('{}={}'.format(pkgname, 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): 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) data = self.map_update_data(pkgname=pkgname, latest_version=latest_version, srcinfo=srcinfo)

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

@@ -241,7 +241,7 @@ class UpdatesSummarizer:
for idx, dep in enumerate(deps): for idx, dep in enumerate(deps):
data = deps_data[dep[0]] 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 sorted_pkgs[idx] = pkg
context.to_install[dep[0]] = pkg context.to_install[dep[0]] = pkg