From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ACDDB15800F for ; Tue, 24 Jan 2023 18:57:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2C90E0886; Tue, 24 Jan 2023 18:57:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BB266E0886 for ; Tue, 24 Jan 2023 18:57:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0D0C340D65 for ; Tue, 24 Jan 2023 18:57:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1CD3F75 for ; Tue, 24 Jan 2023 18:57:50 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1674586621.0883521640398078ae4f363ffad78eaa1626ee55.arthurzam@gentoo> Subject: [gentoo-commits] proj/pkgcore/pkgcheck:master commit in: src/pkgcheck/checks/ X-VCS-Repository: proj/pkgcore/pkgcheck X-VCS-Files: src/pkgcheck/checks/git.py X-VCS-Directories: src/pkgcheck/checks/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 0883521640398078ae4f363ffad78eaa1626ee55 X-VCS-Branch: master Date: Tue, 24 Jan 2023 18:57:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 02e025b9-76fe-480f-a188-ac4a5020f566 X-Archives-Hash: ff17f01e6f22f680d3a10ec4b9c8e992 commit: 0883521640398078ae4f363ffad78eaa1626ee55 Author: Arthur Zamarin gentoo org> AuthorDate: Tue Jan 24 18:57:01 2023 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Tue Jan 24 18:57:01 2023 +0000 URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=08835216 RdependChange: skip when revbumped in same batch Resolves: https://github.com/pkgcore/pkgcheck/issues/459 Signed-off-by: Arthur Zamarin gentoo.org> src/pkgcheck/checks/git.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pkgcheck/checks/git.py b/src/pkgcheck/checks/git.py index adc16874..c7c78bc8 100644 --- a/src/pkgcheck/checks/git.py +++ b/src/pkgcheck/checks/git.py @@ -340,7 +340,7 @@ class GitPkgCommitsCheck(GentooRepoCheck, GitCommitsCheck): else: yield MissingMove(old_key, new_key, pkg=pkg) - def modified_checks(self, pkgs): + def modified_checks(self, pkgs, added): """Check for issues due to package modifications.""" pkg = pkgs[0] @@ -361,7 +361,7 @@ class GitPkgCommitsCheck(GentooRepoCheck, GitCommitsCheck): # ignore broken ebuild return - if old_pkg.rdepend != new_pkg.rdepend: + if pkg not in added and old_pkg.rdepend != new_pkg.rdepend: yield RdependChange(pkg=new_pkg) old_slot, new_slot = old_pkg.slot, new_pkg.slot @@ -437,7 +437,7 @@ class GitPkgCommitsCheck(GentooRepoCheck, GitCommitsCheck): yield from self.rename_checks(list(pkg_map["R"])) # run modified package checks if modified := [pkg for pkg in pkg_map["M"] if pkg not in pkg_map["D"]]: - yield from self.modified_checks(modified) + yield from self.modified_checks(modified, list(pkg_map["A"])) for git_pkg in pkgset: # remaining checks are irrelevant for removed packages