From owner-svn-ports-all@freebsd.org Thu Feb 20 20:38:01 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 02771244F7A; Thu, 20 Feb 2020 20:38:01 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48Nmcm6Ldnz42d1; Thu, 20 Feb 2020 20:38:00 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCA6627700; Thu, 20 Feb 2020 20:38:00 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01KKc0Zs077217; Thu, 20 Feb 2020 20:38:00 GMT (envelope-from grembo@FreeBSD.org) Received: (from grembo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01KKc0TK077215; Thu, 20 Feb 2020 20:38:00 GMT (envelope-from grembo@FreeBSD.org) Message-Id: <202002202038.01KKc0TK077215@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grembo set sender to grembo@FreeBSD.org using -f From: Michael Gmelin Date: Thu, 20 Feb 2020 20:38:00 +0000 (UTC) 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 X-SVN-Group: ports-branches X-SVN-Commit-Author: grembo X-SVN-Commit-Paths: in branches/2020Q1/sysutils/iocage: . files X-SVN-Commit-Revision: 526588 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Feb 2020 20:38:01 -0000 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