diff options
Diffstat (limited to '0001-saltssh-py38.patch')
| -rw-r--r-- | 0001-saltssh-py38.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/0001-saltssh-py38.patch b/0001-saltssh-py38.patch new file mode 100644 index 000000000000..e099a04a5962 --- /dev/null +++ b/0001-saltssh-py38.patch @@ -0,0 +1,25 @@ +index a3be0b8a1c..ff548923f4 100644 +--- "a/salt/grains/core.py" ++++ "b/salt/grains/core.py" +@@ -35,12 +35,6 @@ except ImportError: + __proxyenabled__ = ['*'] + __FQDN__ = None + +-# Extend the default list of supported distros. This will be used for the +-# /etc/DISTRO-release checking that is part of linux_distribution() +-from platform import _supported_dists +-_supported_dists += ('arch', 'mageia', 'meego', 'vmware', 'bluewhite64', +- 'slamd64', 'ovs', 'system', 'mint', 'oracle', 'void') +- + # linux_distribution deprecated in py3.7 + try: + from platform import linux_distribution as _deprecated_linux_distribution +@@ -1939,7 +1933,7 @@ def os_data(): + ) + (osname, osrelease, oscodename) = \ + [x.strip('"').strip("'") for x in +- linux_distribution(supported_dists=_supported_dists)] ++ linux_distribution()] + # Try to assign these three names based on the lsb info, they tend to + # be more accurate than what python gets from /etc/DISTRO-release. + # It's worth noting that Ubuntu has patched their Python distribution |