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:]))
