svn commit: r526586 - in head/sysutils/iocage: . files

[Michael Gmelin]

Author: grembo
Date: Thu Feb 20 20:28:53 2020
New Revision: 526586
URL: https://svnweb.freebsd.org/changeset/ports/526586

Log:
  Fix accidental overwriting of properties on update
  
  See:
  https://github.com/iocage/iocage/issues/1130
  https://github.com/iocage/iocage/commit/b47dc2c47ff125d644720b03f598a9caf4e08192
  
  PR:		244252
  MFH:		2020Q1 (runtime fix)

Added:
  head/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py   (contents, props changed)
Modified:
  head/sysutils/iocage/Makefile

Modified: head/sysutils/iocage/Makefile
==============================================================================
--- head/sysutils/iocage/Makefile	Thu Feb 20 19:08:31 2020	(r526585)
+++ head/sysutils/iocage/Makefile	Thu Feb 20 20:28:53 2020	(r526586)
@@ -2,7 +2,7 @@
 
 PORTNAME=	iocage
 PORTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

Added: head/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/iocage/files/patch-iocage__lib_ioc__fetch.py	Thu Feb 20 20:28:53 2020	(r526586)
@@ -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