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

[fix][aur] not able to downgrade some packages with multiple equal versions on their release history

Browse Source
This commit is contained in:
Vinícius Moreira
2020-02-13 12:47:55 -03:00
parent 7fc1d4d2b5
commit 0c682a5178
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -22,6 +22,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- the temp dir used now has a different name if you launch bauh as the root user to avoid permissioning issues ( **/tmp/bauh_root** ) - the temp dir used now has a different name if you launch bauh as the root user to avoid permissioning issues ( **/tmp/bauh_root** )
### Fixes ### Fixes
- AUR:
- not able to downgrade some packages with multiple equal versions on their release history
- Web: - Web:
- not able to launch applications for the root user - not able to launch applications for the root user
- not able to upgrade the environment's NodeJS version - not able to upgrade the environment's NodeJS version

11
bauh/gems/arch/controller.py
View File

@@ -228,6 +228,7 @@ class ArchManager(SoftwareManager):
if len(commit_list) > 1: if len(commit_list) > 1:
srcfields = {'pkgver', 'pkgrel'} srcfields = {'pkgver', 'pkgrel'}
commit_found = None
for idx in range(1, len(commit_list)): for idx in range(1, len(commit_list)):
commit = commit_list[idx] commit = commit_list[idx]
with open(srcinfo_path) as f: with open(srcinfo_path) as f:
@@ -239,7 +240,17 @@ class ArchManager(SoftwareManager):
if '{}-{}'.format(pkgsrc.get('pkgver'), pkgsrc.get('pkgrel')) == pkg.version: if '{}-{}'.format(pkgsrc.get('pkgver'), pkgsrc.get('pkgrel')) == pkg.version:
# current version found # current version found
commit_found = commit
elif commit_found:
watcher.change_substatus(self.i18n['arch.downgrade.version_found']) watcher.change_substatus(self.i18n['arch.downgrade.version_found'])
if not handler.handle(SystemProcess(subproc=new_subprocess(['git', 'checkout', commit_found], cwd=clone_path), check_error_output=False)):
watcher.print("Could not rollback to current version's commit")
return False
if not handler.handle(SystemProcess(subproc=new_subprocess(['git', 'reset', '--hard', commit_found], cwd=clone_path), check_error_output=False)):
watcher.print("Could not downgrade to previous commit of '{}'. Aborting...".format(commit_found))
return False
break break
watcher.change_substatus(self.i18n['arch.downgrade.install_older']) watcher.change_substatus(self.i18n['arch.downgrade.install_older'])