Merge branch 'release_16.07' into dev

This commit is contained in:
Dannon Baker
2016-08-16 16:45:34 -04:00
+1 -1
View File
@@ -307,7 +307,7 @@ def hash_conda_packages(conda_packages, conda_target=None):
# these commands as Python
def install_conda(conda_context=None):
conda_context = _ensure_conda_context(conda_context)
f, script_path = tempfile.mkstemp(suffix=".bash", prefix="conda_install")
f, script_path = tempfile.mkstemp(suffix=".sh", prefix="conda_install")
os.close(f)
download_cmd = " ".join(commands.download_command(conda_link(), to=script_path, quote_url=True))
install_cmd = "bash '%s' -b -p '%s'" % (script_path, conda_context.conda_prefix)