Date: Sat, 18 Jan 2025 09:34:15 GMT From: Kirill Ponomarev <krion@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 338a47632e41 - main - sysutils/py-salt: Fix modules config Message-ID: <202501180934.50I9YF9n061787@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=338a47632e418ea1525fd77356d965c5d94bc6f2 commit 338a47632e418ea1525fd77356d965c5d94bc6f2 Author: Kirill Ponomarev <krion@FreeBSD.org> AuthorDate: 2025-01-18 09:33:32 +0000 Commit: Kirill Ponomarev <krion@FreeBSD.org> CommitDate: 2025-01-18 09:33:32 +0000 sysutils/py-salt: Fix modules config PR: 284118 Reported by: meka Reviewed by: asomers --- sysutils/py-salt/Makefile | 1 + sysutils/py-salt/files/patch-salt_modules_config.py | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 19c86921caa9..f969375b7683 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -1,5 +1,6 @@ PORTNAME= salt PORTVERSION= 3006.9 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= sysutils python MASTER_SITES= PYPI diff --git a/sysutils/py-salt/files/patch-salt_modules_config.py b/sysutils/py-salt/files/patch-salt_modules_config.py new file mode 100644 index 000000000000..197f64dc1b8e --- /dev/null +++ b/sysutils/py-salt/files/patch-salt_modules_config.py @@ -0,0 +1,17 @@ +--- salt/modules/config.py.orig 2025-01-17 15:15:13 UTC ++++ salt/modules/config.py +@@ -17,13 +17,7 @@ from salt.loader.context import LoaderContext + import salt.utils.sdb as sdb + from salt.loader.context import LoaderContext + +-try: +- # Gated for salt-ssh (salt.utils.cloud imports msgpack) +- import salt.utils.cloud +- +- HAS_CLOUD = True +-except ImportError: +- HAS_CLOUD = False ++HAS_CLOUD = False + + + if salt.utils.platform.is_windows():
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501180934.50I9YF9n061787>