summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2020-11-03 06:11:32 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2020-11-03 06:11:51 +0000
commit1e4682bd9f86a3c13e045fb377038a717d50541e (patch)
tree19337fc2c1c8e1abca241d540505f96e28587d9a
parentMerging upstream version 0.14.0. (diff)
downloadgitlint-1e4682bd9f86a3c13e045fb377038a717d50541e.tar.xz
gitlint-1e4682bd9f86a3c13e045fb377038a717d50541e.zip
Refreshing python3-hook.patch.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/debian/0001-python3-hook.patch16
1 files 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