Fix RabbitMQ connections with Python 3.x

- Bump PORTREVISION for package change

PR:		232246
Submitted by:	Kai <freebsd_ports@k-worx.org>
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2018-10-16 20:05:52 +00:00
parent 190cedf60e
commit beb418a8fa
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=482259
2 changed files with 14 additions and 0 deletions

View file

@ -3,6 +3,7 @@
PORTNAME= oslo.messaging
PORTVERSION= 6.0.0
PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -0,0 +1,13 @@
--- oslo_messaging/_drivers/impl_rabbit.py.orig 2018-03-27 18:46:38 UTC
+++ oslo_messaging/_drivers/impl_rabbit.py
@@ -919,8 +919,8 @@ class Connection(object):
% (self.connection_id, str(e)))
else:
sock.settimeout(timeout)
- # TCP_USER_TIMEOUT is not defined on Windows and Mac OS X
- if sys.platform != 'win32' and sys.platform != 'darwin':
+ # TCP_USER_TIMEOUT is not defined on FreeBSD, Windows and Mac OS X
+ if sys.platform[0:7] != 'freebsd' and sys.platform != 'win32' and sys.platform != 'darwin':
try:
timeout = timeout * 1000 if timeout is not None else 0
# NOTE(gdavoian): only integers and strings are allowed