From 1e4682bd9f86a3c13e045fb377038a717d50541e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 3 Nov 2020 07:11:32 +0100 Subject: Refreshing python3-hook.patch. Signed-off-by: Daniel Baumann --- debian/patches/debian/0001-python3-hook.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/debian/0001-python3-hook.patch b/debian/patches/debian/0001-python3-hook.patch index 74cdcea..64ab7d0 100644 --- a/debian/patches/debian/0001-python3-hook.patch +++ b/debian/patches/debian/0001-python3-hook.patch @@ -4,12 +4,12 @@ Description: Using python3 in commit-msg hook (Closes: #891538). diff -Naurp gitlint.orig/gitlint/files/commit-msg gitlint/gitlint/files/commit-msg --- gitlint.orig/gitlint/files/commit-msg +++ gitlint/gitlint/files/commit-msg -@@ -26,7 +26,7 @@ fi - - run_gitlint(){ - echo "gitlint: checking commit message..." -- python -m gitlint.cli --staged --msg-filename "$1" -+ python3 -m gitlint.cli --staged --msg-filename "$1" - gitlint_exit_code=$? - } +@@ -26,7 +26,7 @@ exit_code=$? + # This is the case for Atlassian SourceTree, where $PATH deviates from the user's shell $PATH. + if [ $exit_code -eq 127 ]; then + echo "Fallback to python module execution" +- python -m gitlint.cli --staged --msg-filename "$1" run-hook ++ python3 -m gitlint.cli --staged --msg-filename "$1" run-hook + exit_code=$? + fi -- cgit v1.2.3