Date: Fri, 12 Jul 2024 15:26:25 GMT From: Michael Gmelin <grembo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 41e0bde90dbb - 2024Q3 - sysutils/iocage: Fixes for python 3.11 Message-ID: <202407121526.46CFQPN1001927@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q3 has been updated by grembo: URL: https://cgit.FreeBSD.org/ports/commit/?id=41e0bde90dbb4bedf8411fbc278606d92cf90208 commit 41e0bde90dbb4bedf8411fbc278606d92cf90208 Author: Michael Gmelin <grembo@FreeBSD.org> AuthorDate: 2024-07-12 14:30:27 +0000 Commit: Michael Gmelin <grembo@FreeBSD.org> CommitDate: 2024-07-12 15:24:51 +0000 sysutils/iocage: Fixes for python 3.11 PR: 280219 Reported by: asomers Tested by: asomers (cherry picked from commit e15d19c28d11eb9da6ad543b4e3f0ff61783ced5) --- sysutils/iocage/Makefile | 2 +- sysutils/iocage/files/patch-iocage__lib_ioc__common.py | 11 +++++++++++ sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile index c3c32a102859..c7215b853300 100644 --- a/sysutils/iocage/Makefile +++ b/sysutils/iocage/Makefile @@ -1,6 +1,6 @@ PORTNAME= iocage PORTVERSION= 1.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/iocage/files/patch-iocage__lib_ioc__common.py b/sysutils/iocage/files/patch-iocage__lib_ioc__common.py new file mode 100644 index 000000000000..1216797ef225 --- /dev/null +++ b/sysutils/iocage/files/patch-iocage__lib_ioc__common.py @@ -0,0 +1,11 @@ +--- iocage_lib/ioc_common.py.orig 2024-07-10 17:23:47 UTC ++++ iocage_lib/ioc_common.py +@@ -77,7 +77,7 @@ def callback(_log, callback_exception): + else: + if not isinstance(message, str) and isinstance( + message, +- collections.Iterable ++ collections.abc.Iterable + ): + message = '\n'.join(message) + diff --git a/sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py b/sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py new file mode 100644 index 000000000000..1588ef95399f --- /dev/null +++ b/sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py @@ -0,0 +1,11 @@ +--- iocage_lib/ioc_exceptions.py.orig 2024-07-10 17:22:46 UTC ++++ iocage_lib/ioc_exceptions.py +@@ -31,7 +31,7 @@ class ExceptionWithMsg(Exception): + def __init__(self, message): + if not isinstance(message, str) and not isinstance( + message, +- collections.Iterable ++ collections.abc.Iterable + ): + message = [message] +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407121526.46CFQPN1001927>