Commit a1bb822c by Ben Patterson

Generify message. User will see context in previous console line.

parent 3f79dd0b
...@@ -11,6 +11,7 @@ from .utils.envs import Env ...@@ -11,6 +11,7 @@ from .utils.envs import Env
PREREQS_MD5_DIR = os.getenv('PREREQ_CACHE_DIR', Env.REPO_ROOT / '.prereqs_cache') PREREQS_MD5_DIR = os.getenv('PREREQ_CACHE_DIR', Env.REPO_ROOT / '.prereqs_cache')
NPM_REGISTRY = "http://registry.npmjs.org/" NPM_REGISTRY = "http://registry.npmjs.org/"
NO_PREREQ_MESSAGE = "NO_PREREQ_INSTALL is set, not installing prereqs"
# If you make any changes to this list you also need to make # If you make any changes to this list you also need to make
# a corresponding change to circle.yml, which is how the python # a corresponding change to circle.yml, which is how the python
...@@ -147,7 +148,7 @@ def install_ruby_prereqs(): ...@@ -147,7 +148,7 @@ def install_ruby_prereqs():
Installs Ruby prereqs Installs Ruby prereqs
""" """
if no_prereq_install(): if no_prereq_install():
print "NO_PREREQ_INSTALL is set, not installing Ruby prereqs" print NO_PREREQ_MESSAGE
return return
prereq_cache("Ruby prereqs", ["Gemfile"], ruby_prereqs_installation) prereq_cache("Ruby prereqs", ["Gemfile"], ruby_prereqs_installation)
...@@ -159,7 +160,7 @@ def install_node_prereqs(): ...@@ -159,7 +160,7 @@ def install_node_prereqs():
Installs Node prerequisites Installs Node prerequisites
""" """
if no_prereq_install(): if no_prereq_install():
print "NO_PREREQ_INSTALL is set, not installing node prereqs" print NO_PREREQ_MESSAGE
return return
prereq_cache("Node prereqs", ["package.json"], node_prereqs_installation) prereq_cache("Node prereqs", ["package.json"], node_prereqs_installation)
...@@ -171,7 +172,7 @@ def install_python_prereqs(): ...@@ -171,7 +172,7 @@ def install_python_prereqs():
Installs Python prerequisites Installs Python prerequisites
""" """
if no_prereq_install(): if no_prereq_install():
print "NO_PREREQ_INSTALL is set, not installing Python prereqs" print NO_PREREQ_MESSAGE
return return
prereq_cache("Python prereqs", PYTHON_REQ_FILES + [sysconfig.get_python_lib()], python_prereqs_installation) prereq_cache("Python prereqs", PYTHON_REQ_FILES + [sysconfig.get_python_lib()], python_prereqs_installation)
...@@ -183,7 +184,7 @@ def install_prereqs(): ...@@ -183,7 +184,7 @@ def install_prereqs():
Installs Ruby, Node and Python prerequisites Installs Ruby, Node and Python prerequisites
""" """
if no_prereq_install(): if no_prereq_install():
print "NO_PREREQ_INSTALL is set, not installing any prereqs" print NO_PREREQ_MESSAGE
return return
install_ruby_prereqs() install_ruby_prereqs()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment