Skip to content

fix pkg.installed on freebsd #68887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
network-shark wants to merge 1 commit into
base: 3006.x
Choose a base branch
from
Open

fix pkg.installed on freebsd #68887

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions salt/states/pkg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,10 @@ def _verify_install(desired, new_pkgs, ignore_epoch=None, new_caps=None):
elif pkgver == "latest":
_ok.append(pkgname)
continue
elif __grains__["os"] == "FreeBSD" and pkgver:
cver = [k for k, v in new_pkgs.items() if v["version"] == pkgver]
_ok.append(pkgname)
continue
Comment on lines +920 to +923
Copy link
Copy Markdown
Contributor

@bdrx312 bdrx312 Apr 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On first glance this does not appear like it is the correct solution. I think _fulfills_version_string should be covering this.

Copy link
Copy Markdown
Contributor Author

@network-shark network-shark Apr 6, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the hint I will answer in the issue @bdrx312 . Hope to get some feedback thanks

elif not __salt__["pkg_resource.version_clean"](pkgver):
_ok.append(pkgname)
continue
Expand Down
Loading