salt: fix compatibility with pyzmq 23.0.0
This commit is contained in:
parent
4a44367e3c
commit
bfc89857e7
2 changed files with 14 additions and 1 deletions
13
srcpkgs/salt/patches/zeromq-transport.patch
Normal file
13
srcpkgs/salt/patches/zeromq-transport.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
Code taken from https://github.com/saltstack/salt/pull/62119/
|
||||
--- a/salt/transport/zeromq.py 2021-08-24 14:17:07.000000000 -0500
|
||||
+++ b/salt/transport/zeromq.py 2022-05-31 09:50:44.113967910 -0500
|
||||
@@ -977,7 +977,7 @@
|
||||
try:
|
||||
pub_sock.setsockopt(zmq.HWM, self.opts.get("pub_hwm", 1000))
|
||||
# in zmq >= 3.0, there are separate send and receive HWM settings
|
||||
- except AttributeError:
|
||||
+ except (AttributeError, zmq.error.ZMQError):
|
||||
# Set the High Water Marks. For more information on HWM, see:
|
||||
# http://api.zeromq.org/4-1:zmq-setsockopt
|
||||
pub_sock.setsockopt(zmq.SNDHWM, self.opts.get("pub_hwm", 1000))
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'salt'
|
||||
pkgname=salt
|
||||
version=3003.3
|
||||
revision=3
|
||||
revision=4
|
||||
build_style=python3-module
|
||||
hostmakedepends="python3-setuptools"
|
||||
depends="python3-yaml python3-Jinja2 python3-requests python3-pyzmq
|
||||
|
|
Loading…
Add table
Reference in a new issue