From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1646299-garchives=archives.gentoo.org@lists.gentoo.org>
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 0CBB715802E
for <garchives@archives.gentoo.org>; Mon, 24 Jun 2024 18:05:23 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1F0F42BC0AF;
Mon, 24 Jun 2024 18:05:21 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 02C812BC0AF
for <gentoo-commits@lists.gentoo.org>; Mon, 24 Jun 2024 18:05:21 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 67531335CB9
for <gentoo-commits@lists.gentoo.org>; Mon, 24 Jun 2024 18:05:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BF9461D48
for <gentoo-commits@lists.gentoo.org>; Mon, 24 Jun 2024 18:05:17 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1717772563.6f191a5c058c26722a9a16d8f03e04b0ffbef3cf.mattst88@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: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: 6f191a5c058c26722a9a16d8f03e04b0ffbef3cf
X-VCS-Branch: master
Date: Mon, 24 Jun 2024 18:05:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 52e0c711-b4af-4a15-8137-7164e51d68b1
X-Archives-Hash: e4ad8ad0f45b4154a99539f05f7da95d
commit: 6f191a5c058c26722a9a16d8f03e04b0ffbef3cf
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue May 28 23:15:35 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 15:02:43 2024 +0000
URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=6f191a5c
bin/merge-driver-ekeyword: Don't pass program name to main()
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
bin/merge-driver-ekeyword | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/bin/merge-driver-ekeyword b/bin/merge-driver-ekeyword
index 9a7a666..59527bb 100755
--- a/bin/merge-driver-ekeyword
+++ b/bin/merge-driver-ekeyword
@@ -112,13 +112,13 @@ def apply_keyword_changes(ebuild: str, pathname: str,
def main(argv: Sequence[str]) -> int:
- if len(argv) != 5:
+ if len(argv) != 4:
return -1
- O = argv[1] # %O - filename of original
- A = argv[2] # %A - filename of our current version
- B = argv[3] # %B - filename of the other branch's version
- P = argv[4] # %P - original path of the file
+ O = argv[0] # %O - filename of original
+ A = argv[1] # %A - filename of our current version
+ B = argv[2] # %B - filename of the other branch's version
+ P = argv[3] # %P - original path of the file
# Get changes to KEYWORDS= from %O to %B
if changes := keyword_changes(O, B):
@@ -140,4 +140,4 @@ def main(argv: Sequence[str]) -> int:
if __name__ == "__main__":
- sys.exit(main(sys.argv))
+ sys.exit(main(sys.argv[1:]))