internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pacman: Fix name of URL packages (#4959) (#4971)

Browse Source 
* Strip downloading... of unseen URLs

* Added changelog fragment

* Added integration tests for reason and reason_for

Inspired by the integration tests for url packages

* Revert "Added integration tests for reason and reason_for"

This reverts commit f60d92f0d7.

Accidentally commited to the wrong branch.

(cherry picked from commit 788cfb624a)

Co-authored-by: Minei3oat <Minei3oat@users.noreply.github.com>
This commit is contained in:
patchback[bot]
2022-07-21 20:16:28 +02:00
committed by GitHub
parent 4d2895676f
commit e86fcf76fc
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/4959-pacman-fix-url-packages-name.yaml Normal file
View File

@@ -0,0 +1,2 @@
bugfixes:
- pacman - fixed name resolution of URL packages (https://github.com/ansible-collections/community.general/pull/4959).

5
plugins/modules/packaging/os/pacman.py
View File

@@ -613,8 +613,9 @@ class Pacman(object):
stderr=stderr, stderr=stderr,
rc=rc, rc=rc,
) )
# With Pacman v6.0.1 - libalpm v13.0.1, --upgrade outputs "loading packages..." on stdout. strip that # With Pacman v6.0.1 - libalpm v13.0.1, --upgrade outputs " filename_without_extension downloading..." if the URL is unseen.
stdout = stdout.replace("loading packages...\n", "") # In all cases, pacman outputs "loading packages..." on stdout. strip both
stdout = stdout.splitlines()[-1]
is_URL = True is_URL = True
pkg_name = stdout.strip() pkg_name = stdout.strip()
pkg_list.append(Package(name=pkg_name, source=pkg, source_is_URL=is_URL)) pkg_list.append(Package(name=pkg_name, source=pkg, source_is_URL=is_URL))