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 9CBBB15800A for ; Tue, 29 Aug 2023 15:48:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CFBE92BC014; Tue, 29 Aug 2023 15:48:24 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B89692BC014 for ; Tue, 29 Aug 2023 15:48:24 +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 962FC340948 for ; Tue, 29 Aug 2023 15:48:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC90710CF for ; Tue, 29 Aug 2023 15:48:20 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1693323671.67983750f9014d5b1821b9cd2522b34f04ce1795.floppym@gentoo> Subject: [gentoo-commits] proj/gentoolkit:master commit in: bin/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: bin/merge-driver-ekeyword X-VCS-Directories: bin/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 67983750f9014d5b1821b9cd2522b34f04ce1795 X-VCS-Branch: master Date: Tue, 29 Aug 2023 15:48:20 +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: 4ad941ba-1407-4089-becd-3326f99b261c X-Archives-Hash: 50e196e8c87160a0429a6f97fded75d2 commit: 67983750f9014d5b1821b9cd2522b34f04ce1795 Author: Mike Gilbert gentoo org> AuthorDate: Tue Aug 29 15:25:55 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Aug 29 15:41:11 2023 +0000 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=67983750 bin/merge-driver-ekeyword: replace os.system with os.execlp Signed-off-by: Mike Gilbert gentoo.org> bin/merge-driver-ekeyword | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/merge-driver-ekeyword b/bin/merge-driver-ekeyword index 0235a98..ae022f3 100755 --- a/bin/merge-driver-ekeyword +++ b/bin/merge-driver-ekeyword @@ -126,11 +126,10 @@ def main(argv: Sequence[str]) -> int: result = apply_keyword_changes(A, P, changes) sys.exit(result) else: - result = os.system(f"git merge-file -L HEAD -L base -L ours {A} {O} {B}") - result = os.waitstatus_to_exitcode(result) - if result < 0 or result >= 128: + try: + os.execlp("git", "git", "merge-file", "-L", "HEAD", "-L", "base", "-L", "ours", A, O, B) + except OSError: sys.exit(-1) - sys.exit(result) if __name__ == "__main__": main(sys.argv)