diff --git a/changelog/61619.fixed b/changelog/61619.fixed new file mode 100644 index 00000000000..4f9159792c9 --- /dev/null +++ b/changelog/61619.fixed @@ -0,0 +1 @@ +Pop!_OS uses the full version (YY.MM) in the osfinger grain now, not just the year. This allows differentiating for example between 20.04 and 20.10. diff --git a/salt/grains/core.py b/salt/grains/core.py index cbfcfa0b621..a3238637ddc 100644 --- a/salt/grains/core.py +++ b/salt/grains/core.py @@ -2258,7 +2258,7 @@ def _osrelease_data(os, osfullname, osrelease): os_name = osfullname grains["osfinger"] = "{}-{}".format( os_name, - osrelease if os_name in ("Ubuntu",) else grains["osrelease_info"][0], + osrelease if os in ("Ubuntu", "Pop") else grains["osrelease_info"][0], ) return grains diff --git a/tests/pytests/unit/grains/test_core.py b/tests/pytests/unit/grains/test_core.py index e4808af4bbd..c19f964fab7 100644 --- a/tests/pytests/unit/grains/test_core.py +++ b/tests/pytests/unit/grains/test_core.py @@ -1243,7 +1243,7 @@ def test_pop_focal_os_grains(): "osrelease": "20.04", "osrelease_info": (20, 4), "osmajorrelease": 20, - "osfinger": "Pop-20", + "osfinger": "Pop-20.04", } _run_os_grains_tests(None, _os_release_map, expectation) @@ -1264,7 +1264,7 @@ def test_pop_impish_os_grains(): "osrelease": "21.10", "osrelease_info": (21, 10), "osmajorrelease": 21, - "osfinger": "Pop-21", + "osfinger": "Pop-21.10", } _run_os_grains_tests(None, _os_release_map, expectation)