Skip to content

Commit

Permalink
[PR #7971/dd25ddfb backport][stable-7] Pkgin fixes (#8015)
Browse files Browse the repository at this point in the history
Pkgin fixes (#7971)

* Solve exception and spurious "changed" in pkgin

* Create changelog

* PEP 8

* Update changelogs/fragments/pkgin.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

---------

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit dd25ddf)

Co-authored-by: Jesús Cea <jcea@jcea.es>
  • Loading branch information
patchback[bot] and jcea committed Feb 23, 2024
1 parent ac86d28 commit 533df42
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 2 additions & 0 deletions changelogs/fragments/pkgin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- pkgin - pkgin (pkgsrc package manager used by SmartOS) raises erratic exceptions and spurious ``changed=true`` (https://github.com/ansible-collections/community.general/pull/7971).
9 changes: 8 additions & 1 deletion plugins/modules/pkgin.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,13 @@ def query_package(module, name):
# '<' - installed but out of date
# '=' - installed and up to date
# '>' - installed but newer than the repository version

if (package in ('reading local summary...',
'processing local summary...',
'downloading pkg_summary.xz done.')) or \
(package.startswith('processing remote summary (')):
continue

pkgname_with_version, raw_state = package.split(splitchar)[0:2]

# Search for package, stripping version
Expand Down Expand Up @@ -317,7 +324,7 @@ def do_upgrade_packages(module, full=False):
format_pkgin_command(module, cmd))

if rc == 0:
if re.search('^nothing to do.\n$', out):
if re.search('^(.*\n|)nothing to do.\n$', out):
module.exit_json(changed=False, msg="nothing left to upgrade")
else:
module.fail_json(msg="could not %s packages" % cmd, stdout=out, stderr=err)
Expand Down

0 comments on commit 533df42

Please sign in to comment.