Attachment 248789 Details for Bug 275738 – fix for the crash

[patch] fix for the crash

0001-Quick-hack-fixing-crash-described-in-bug-275738.patch (text/plain), 1.46 KB, created by Alexey Vyskubov on 2024-02-27 11:56:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Vyskubov

Created: 2024-02-27 11:56:13 UTC

Size: 1.46 KB

patch

obsolete

>From b02e2914f988145bb6f3d1dfffa9fd5f245aaaaa Mon Sep 17 00:00:00 2001
>From: Alexey Vyskubov <alexey@pentode.fi>
>Date: Tue, 27 Feb 2024 13:49:28 +0200
>Subject: [PATCH] Quick hack fixing crash described in bug 275738
>
>This is not a proper fix, but the crash is no more.
>---
> sysutils/iocage/Makefile                          |  2 +-
> sysutils/iocage/files/patch-iocage__lib_iocage.py | 10 ++++++++++
> 2 files changed, 11 insertions(+), 1 deletion(-)
> create mode 100644 sysutils/iocage/files/patch-iocage__lib_iocage.py
>
>diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile
>index 55f7766c0bda..5c727ab8ecf7 100644
>--- a/sysutils/iocage/Makefile
>+++ b/sysutils/iocage/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	iocage
> PORTVERSION=	1.2
>-PORTREVISION=	11
>+PORTREVISION=	12
> CATEGORIES=	sysutils python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>diff --git a/sysutils/iocage/files/patch-iocage__lib_iocage.py b/sysutils/iocage/files/patch-iocage__lib_iocage.py
>new file mode 100644
>index 000000000000..7af7724e6f15
>--- /dev/null
>+++ b/sysutils/iocage/files/patch-iocage__lib_iocage.py
>@@ -0,0 +1,10 @@
>+--- iocage_lib/iocage.py.orig	2019-09-26 07:23:24 UTC
>++++ iocage_lib/iocage.py
>+@@ -279,6 +279,7 @@ class IOCage(ioc_json.IOCZFS):
>+         Return:
>+                 tuple: The jails uuid, path
>+         """
>++        self.jail = self.jail.rstrip(os.sep)
>+ 
>+         if os.path.isdir(f"{self.iocroot}/jails/{self.jail}"):
>+             path = f"{self.iocroot}/jails/{self.jail}"
>-- 
>2.43.2
>

Actions: View | Diff

Attachments on bug 275738: 248789