mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
* 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 commitf60d92f0d7
. Accidentally commited to the wrong branch. (cherry picked from commit788cfb624a
) Co-authored-by: Minei3oat <Minei3oat@users.noreply.github.com>
This commit is contained in:
parent
8854f4d948
commit
22773418d2
2 changed files with 5 additions and 2 deletions
|
@ -0,0 +1,2 @@
|
|||
bugfixes:
|
||||
- pacman - fixed name resolution of URL packages (https://github.com/ansible-collections/community.general/pull/4959).
|
|
@ -636,8 +636,9 @@ class Pacman(object):
|
|||
stderr=stderr,
|
||||
rc=rc,
|
||||
)
|
||||
# With Pacman v6.0.1 - libalpm v13.0.1, --upgrade outputs "loading packages..." on stdout. strip that
|
||||
stdout = stdout.replace("loading packages...\n", "")
|
||||
# With Pacman v6.0.1 - libalpm v13.0.1, --upgrade outputs " filename_without_extension downloading..." if the URL is unseen.
|
||||
# In all cases, pacman outputs "loading packages..." on stdout. strip both
|
||||
stdout = stdout.splitlines()[-1]
|
||||
is_URL = True
|
||||
pkg_name = stdout.strip()
|
||||
pkg_list.append(Package(name=pkg_name, source=pkg, source_is_URL=is_URL))
|
||||
|
|
Loading…
Reference in a new issue