Attachment 251966 Details for Bug 280219 – Fix the errors in two iocage modules

[patch] Fix the errors in two iocage modules

0001-sysutils-iocage-fix-has-no-attribute-Iterable-errors.patch (text/plain), 2.33 KB, created by Alan Somers on 2024-07-10 17:40:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Somers

Created: 2024-07-10 17:40:57 UTC

Size: 2.33 KB

patch

obsolete

>From 2da27cf87477145c3fb82c97e3091ce429c8ec64 Mon Sep 17 00:00:00 2001
>From: Alan Somers <asomers@FreeBSD.org>
>Date: Wed, 10 Jul 2024 11:36:51 -0600
>Subject: [PATCH] sysutils/iocage: fix "has no attribute 'Iterable'" errors
> with py3.11
>
>MFH:		2024Q3
>PR:		280219
>Sponsored by:	Axcient
>---
> sysutils/iocage/Makefile                              |  2 +-
> .../iocage/files/patch-iocage__lib_ioc__common.py     | 11 +++++++++++
> .../iocage/files/patch-iocage__lib_ioc__exceptions.py | 11 +++++++++++
> 3 files changed, 23 insertions(+), 1 deletion(-)
> create mode 100644 sysutils/iocage/files/patch-iocage__lib_ioc__common.py
> create mode 100644 sysutils/iocage/files/patch-iocage__lib_ioc__exceptions.py
>
>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]
>+ 
>-- 
>2.45.2
>

Flags:

asomers: maintainer-approval? (grembo)

Actions: View | Diff

Attachments on bug 280219: 251966