diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2020-05-05 21:23:57 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-05-05 20:34:39 +0000 |
| commit | e52ea606bbbfca6079162539ceba2466c4ef0e6b (patch) | |
| tree | f0857f1edd08807a63a653fbf7403738c9b65fba | |
| parent | 4954eda707d5b64e399338eab80d7b97fc4fcc69 (diff) | |
| download | aports-e52ea606bbbfca6079162539ceba2466c4ef0e6b.tar.bz2 aports-e52ea606bbbfca6079162539ceba2466c4ef0e6b.tar.xz | |
community/salt: reabse patches
| -rw-r--r-- | community/salt/APKBUILD | 2 | ||||
| -rw-r--r-- | community/salt/fix-grains-dist-detection.patch | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/community/salt/APKBUILD b/community/salt/APKBUILD index d620a2bb85..80abd54c5e 100644 --- a/community/salt/APKBUILD +++ b/community/salt/APKBUILD @@ -154,4 +154,4 @@ cfbbeb8023a383e7c42d84e3346edfd068c9ec7650c4ddc3caa38534da325a67497e1f06ca02cc1f 31521a7bf9455a805652ebb2c2a258148d654169caed500dbf1fe0c26baf26b330217117fe84a13706ded75a9eedadc0bbd671ede0957ed4d60d1e766fea6b39 salt-minion.initd bafc6ea10cdafd0aef868feb35aecbe4ae6a7dff0ae42862bded85715ad763eb89e1ed27437866a7e5f2b9f7064e3c2a3fb59814487744ba4227238d95cf3818 salt-syndic.confd d71133e834685304e0167554035ebbc861252f972bbe981cc71e45b70f15d94a28a02a369463c9a641372919689f96b62a0408b14f824ad986d536e52b1e5ec0 salt-syndic.initd -c61280af9db7bb1551c5c80901d455ea074859cc5b6615e5caba694f5a2188e37e0a85ca2491e233861162da534599f9e455dc93a95b7741fbcf9508e7498ae9 fix-grains-dist-detection.patch" +377fea82f4ad62804a89cae556e74ac04e8fc401364f5ae570cbea00d21417d6e00fcc0aca52c9f8c158e067f0588f54915fb8ea8a970bacf26df653c2779110 fix-grains-dist-detection.patch" diff --git a/community/salt/fix-grains-dist-detection.patch b/community/salt/fix-grains-dist-detection.patch index 0063eef211..07f9664f4a 100644 --- a/community/salt/fix-grains-dist-detection.patch +++ b/community/salt/fix-grains-dist-detection.patch @@ -5,18 +5,18 @@ Just completely remove the backwards compatibility and completely rely on that module. diff --git a/salt/grains/core.py b/salt/grains/core.py -index f05276c..58edaee 100644 +index 04c1ae9..9280975 100644 --- a/salt/grains/core.py +++ b/salt/grains/core.py -@@ -22,6 +22,7 @@ import locale - import uuid - from errno import EACCES, EPERM +@@ -24,6 +24,7 @@ from errno import EACCES, EPERM import datetime + import warnings + import time +from distro import linux_distribution # pylint: disable=import-error try: -@@ -33,18 +34,6 @@ except ImportError: +@@ -35,23 +36,6 @@ except ImportError: __proxyenabled__ = ['*'] __FQDN__ = None @@ -28,14 +28,19 @@ index f05276c..58edaee 100644 - -# linux_distribution deprecated in py3.7 -try: -- from platform import linux_distribution +- from platform import linux_distribution as _deprecated_linux_distribution +- +- def linux_distribution(**kwargs): +- with warnings.catch_warnings(): +- warnings.simplefilter("ignore") +- return _deprecated_linux_distribution(**kwargs) -except ImportError: - from distro import linux_distribution - # Import salt libs import salt.exceptions import salt.log -@@ -1871,7 +1860,7 @@ def os_data(): +@@ -1920,7 +1904,7 @@ def os_data(): ) (osname, osrelease, oscodename) = \ [x.strip('"').strip("'") for x in |