Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Feb 2020 20:38:00 +0000 (UTC)
From:      Michael Gmelin <grembo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r526588 - in branches/2020Q1/sysutils/iocage: . files
Message-ID:  <202002202038.01KKc0TK077215@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: grembo
Date: Thu Feb 20 20:38:00 2020
New Revision: 526588
URL: https://svnweb.freebsd.org/changeset/ports/526588

Log:
  MFH: r526586
  
  Fix accidental overwriting of properties on update
  
  See:
  https://github.com/iocage/iocage/issues/1130
  https://github.com/iocage/iocage/commit/b47dc2c47ff125d644720b03f598a9caf4e08192
  
  PR:		244252
  
  Approved by:	portmgr (runtime fix blanket)

Added:
  branches/2020Q1/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py
     - copied unchanged from r526586, head/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py
Modified:
  branches/2020Q1/sysutils/iocage/Makefile
Directory Properties:
  branches/2020Q1/   (props changed)

Modified: branches/2020Q1/sysutils/iocage/Makefile
==============================================================================
--- branches/2020Q1/sysutils/iocage/Makefile	Thu Feb 20 20:30:09 2020	(r526587)
+++ branches/2020Q1/sysutils/iocage/Makefile	Thu Feb 20 20:38:00 2020	(r526588)
@@ -2,7 +2,7 @@
 
 PORTNAME=	iocage
 PORTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

Copied: branches/2020Q1/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py (from r526586, head/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q1/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py	Thu Feb 20 20:38:00 2020	(r526588, copy of r526586, head/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py)
@@ -0,0 +1,27 @@
+See https://github.com/iocage/iocage/commit/b47dc2c47ff125d644720b03f598a9caf4e08192
+--- iocage_lib/ioc_fetch.py.orig	2019-09-26 07:23:24 UTC
++++ iocage_lib/ioc_fetch.py
+@@ -964,19 +964,16 @@ class IOCFetch(iocage_lib.ioc_json.IOCZF
+ 
+                     if not cli:
+                         for jail, path in jails.items():
+-                            _json = iocage_lib.ioc_json.IOCJson(path)
++                            _json = iocage_lib.ioc_json.IOCJson(path, cli=False)
+                             props = _json.json_get_value('all')
+ 
+                             if props['basejail'] and self.release.rsplit(
+                                 '-', 1
+                             )[0] in props['release']:
+-                                props['release'] = new_release
+-                                _json.json_write(props)
++                                _json.json_set_value(f'release={new_release}')
+                     else:
+-                        _json = iocage_lib.ioc_json.IOCJson(jails[uuid])
+-                        props = _json.json_get_value('all')
+-                        props['release'] = new_release
+-                        _json.json_write(props)
++                        _json = iocage_lib.ioc_json.IOCJson(jails[uuid], cli=False)
++                        _json.json_set_value(f'release={new_release}')
+ 
+             if self.verify:
+                 # tmp only exists if they verify SSL certs



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002202038.01KKc0TK077215>