From nobody Tue Mar 21 15:06:19 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pgw0q46X1z40QPM; Tue, 21 Mar 2023 15:06:19 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pgw0q3bzWz3NPf; Tue, 21 Mar 2023 15:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679411179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dTcbMtZciJcfvW5cJoDQGQvlbhTgec4nF6XBV2F5vso=; b=G0aHDsRNCgZIzmjUIXlFXl8f6KmbUPJw1J7akozpiP+55INOL793L3DUdDnQNH19A/Xxt5 InLZO5T1pPAEpidsShVvLJPFAoITlR2ZipnMdvkxClQ2f9j3cYYx1rZV0Kuh6tDimOQsSU IG/vodZhZqOuwkfrdJma6qzYaQ2TdtI5pJqDbg8Zly0mk2Z/gzY35hlfVb7nlgyyVcLgSw AsA84DZwAW7EDcVEVApVbxlN5JYfsWxZis3+fik6oCVONC3hwQdL/Fqmmh94YYg+gYD9D1 kuF7Q/thi12n6D+dd9yxCTp/IKDgQBFJ/sV5vShbQb/+l8yG+kvbQBVVlC/pUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679411179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dTcbMtZciJcfvW5cJoDQGQvlbhTgec4nF6XBV2F5vso=; b=R5wka0v4EnP/cQsbGzqupKfQF3wbBJkzySFSymbUauRv0sQfP1LLeMWVVCHC9PnT5nRngs CToBxexpfHe3/D3ZWvsSYg7NdsrqnSLmlLtOVwfxZpWjqrk1f2Dgz6yMiFQxDrTyOF/trb HptwJWty6k4Ra1U2fN+HuDtB/yn/b05djnIQlN0btICZstVzzpGeye2ZEGLjHUEFuiuV4N ONQjsSY2WI8DHIlAEKcX7ukbFtPk1GzFdnaa7Qfwz0XE1WYA3JHpNiPJ3cen5yEblkczuP Y3tddmngatva4GC5yQZuCjtvLgHqJX+p6f2CFG5bKUjiNDnHB1sUfVOuiIXSbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679411179; a=rsa-sha256; cv=none; b=aGMc360QuVSiTHwDMZUxTfdIdrZcnDdXYO3XW3ZV99l6JrvoHhBpIcSbMbm6qiMlEn9Xwh hfRxWr0fVybWyLvk84Kb6+qd6OCYZJjLK7pOYg5lKH7c5OOWdu57p8Du/uWaCDIXbfZKg6 kSxM723tkW5cdB/PuseW10mIAcC/g8K7Mc6LfzmzjV1whIVtESUljk5xAtb5dcRk9DLw+2 b/alAgyAYnNTXrCPjqedsn8E359UGO0TOKS0HI7imy5FFmybfgxAxU+iAlCUVjXd+Jou8+ jJ21jhg0iz9Js+AytVExGNcM0dh5c82wD5qjQzGiUVPIWSlyQzppDwrig1sR4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pgw0q2h7JzH8K; Tue, 21 Mar 2023 15:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32LF6Je1093539; Tue, 21 Mar 2023 15:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LF6JUh093538; Tue, 21 Mar 2023 15:06:19 GMT (envelope-from git) Date: Tue, 21 Mar 2023 15:06:19 GMT Message-Id: <202303211506.32LF6JUh093538@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brad Davis Subject: git: 97d1d164cab3 - main - sysutils/py-salt: fix runtime conflict with py39-importlib-metadata List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97d1d164cab342554bc413f269bab95752d3e704 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brd: URL: https://cgit.FreeBSD.org/ports/commit/?id=97d1d164cab342554bc413f269bab95752d3e704 commit 97d1d164cab342554bc413f269bab95752d3e704 Author: Alan Somers AuthorDate: 2023-03-21 15:02:58 +0000 Commit: Brad Davis CommitDate: 2023-03-21 15:05:28 +0000 sysutils/py-salt: fix runtime conflict with py39-importlib-metadata PR: 269858 Approved by: maintainer timeout --- sysutils/py-salt/Makefile | 1 + .../py-salt/files/patch-salt_utils_entrypoints.py | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 5a29f0beb390..b32abac6a4de 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -1,5 +1,6 @@ PORTNAME= salt PORTVERSION= 3005.1 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-salt/files/patch-salt_utils_entrypoints.py b/sysutils/py-salt/files/patch-salt_utils_entrypoints.py new file mode 100644 index 000000000000..6dcfa3725648 --- /dev/null +++ b/sysutils/py-salt/files/patch-salt_utils_entrypoints.py @@ -0,0 +1,27 @@ +--- salt/utils/entrypoints.py.orig 2022-09-26 21:22:01 UTC ++++ salt/utils/entrypoints.py +@@ -38,13 +38,20 @@ def iter_entry_points(group, name=None): + entry_points_listing = [] + entry_points = importlib_metadata.entry_points() + +- for entry_point_group, entry_points_list in entry_points.items(): +- if entry_point_group != group: +- continue +- for entry_point in entry_points_list: ++ try: ++ for entry_point in entry_points.select(group=group): + if name is not None and entry_point.name != name: + continue + entry_points_listing.append(entry_point) ++ except AttributeError: ++ # importlib-metadata<5.0.0 ++ for entry_point_group, entry_points_list in entry_points.items(): ++ if entry_point_group != group: ++ continue ++ for entry_point in entry_points_list: ++ if name is not None and entry_point.name != name: ++ continue ++ entry_points_listing.append(entry_point) + + return entry_points_listing +