saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use "VMware Photon OS" instead of "VMware Photon"

Browse source 
The value is "VMware Photon" only on Photon OS 1.0, where there is no
python3 package available, so I think it's fair to ignore that.
This commit is contained in:
Ken Crowell 2020-11-01 14:35:03 -04:00 • committed by Megan Wilhite
parent 13767ad8f1
commit 324eb07cb9
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog/52550.added
View file

@ -1 +1 @@
The pkgrepo state now supports VMware Photon.
The pkgrepo state now supports VMware Photon OS.

2
salt/modules/yumpkg.py
View file

@ -79,7 +79,7 @@ def __virtual__():
"xenserver",
"virtuozzolinux",
"virtuozzo",
"vmware photon",
"vmware photon os",
)
if os_family == "redhat" or os_grain in enabled:

8
salt/states/pkgrepo.py
View file

@ -374,7 +374,7 @@ def managed(name, ppa=None, copr=None, **kwargs):
else salt.utils.data.is_true(disabled)
)
elif __grains__["os_family"] in ("RedHat", "Suse", "VMware Photon"):
elif __grains__["os_family"] in ("RedHat", "Suse", "VMware Photon OS",):
if __grains__["os_family"] in "RedHat":
if copr is not None:
repo = ":".join(("copr", copr))
@ -433,7 +433,7 @@ def managed(name, ppa=None, copr=None, **kwargs):
# not explicitly set, so we don't need to update the repo
# if it's desired to be enabled and the 'enabled' key is
# missing from the repo definition
if __grains__["os_family"] in ("RedHat", "VMware Photon"):
if __grains__["os_family"] in ("RedHat", "VMware Photon OS",):
if not salt.utils.data.is_true(sanitizedkwargs[kwarg]):
break
else:
@ -462,7 +462,7 @@ def managed(name, ppa=None, copr=None, **kwargs):
break
elif kwarg == "comments" and __grains__["os_family"] in (
"RedHat",
"VMware Photon",
"VMware Photon OS",
):
precomments = salt.utils.pkg.rpm.combine_comments(pre[kwarg])
kwargcomments = salt.utils.pkg.rpm.combine_comments(
@ -477,7 +477,7 @@ def managed(name, ppa=None, copr=None, **kwargs):
if __grains__["os_family"] in (
"RedHat",
"Suse",
"VMware Photon",
"VMware Photon OS",
) and any(
isinstance(x, bool) for x in (sanitizedkwargs[kwarg], pre[kwarg])
):