From 05e3d8cccef9bfec5aea2d2dfc6093ab5d1fb13b Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.org>
Date: Wed, 7 Mar 2018 11:08:13 -0500
Subject: [PATCH] fix mercurial step
Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
---
bin/steps/mercurial | 7 +++++--
vendor/pip-pop/pip-grep | 3 ++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/bin/steps/mercurial b/bin/steps/mercurial
index 0eaba331..9faa0d07 100755
--- a/bin/steps/mercurial
+++ b/bin/steps/mercurial
@@ -1,6 +1,9 @@
#!/usr/bin/env bash
# Install Mercurial if it appears to be required.
-if (grep -Fiq "hg+" requirements.txt) then
- /app/.heroku/python/bin/pip install mercurial | cleanup | indent
+if [[ -f "requirements.txt" ]]; then
+ if (grep -Fiq "hg+" requirements.txt) then
+ /app/.heroku/python/bin/pip install mercurial | cleanup | indent
+ fi
fi
+
diff --git a/vendor/pip-pop/pip-grep b/vendor/pip-pop/pip-grep
index 59e51904..d55000ad 100755
--- a/vendor/pip-pop/pip-grep
+++ b/vendor/pip-pop/pip-grep
@@ -8,6 +8,7 @@ Options:
-h --help Show this screen.
"""
import os
+import sys
from docopt import docopt
from pip.req import parse_requirements
from pip.index import PackageFinder
@@ -73,5 +74,5 @@ if __name__ == '__main__':
try:
main()
except Exception:
- pass
+ sys.exit(1)
--
GitLab