Skip to content

Commit

Permalink
Another attempt at fixing env["PATH"] issues.
Browse files Browse the repository at this point in the history
whitequark committed Mar 26, 2018
1 parent 5a88886 commit 49113e9
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -95,24 +95,24 @@ conda_env_name = 'buildbot-%(buildername)s-%(buildnumber)s'
def condaEnv(use_local=False, extra_vars={}):
@renderer
def extendPath(props):
builddir = props.getProperty('builddir')
builddir = props.getProperty("builddir")

if use_local:
env_root = [builddir, '..', 'miniconda', 'envs', conda_env_name]
env_root = [builddir, "..", "miniconda", "envs", conda_env_name]
else:
env_root = [builddir, '..', 'miniconda']
env_root = [builddir, "..", "miniconda"]

if 'windows' in props.getProperty('slavename'):
if "windows" in props.getProperty("slavename"):
return ["\\".join(x) for x in [
env_root,
env_root + '\\Scripts',
env_root + '\\Library\\bin',
'${PATH}'
env_root + ["Scripts"],
env_root + ["Library", "bin"],
["${PATH}"]
]]
else: # *nix
return ["/".join(x) for x in [
env_root + '/bin',
'${PATH}'
env_root + ["bin"],
["${PATH}"]
]]

env = {

0 comments on commit 49113e9

Please sign in to comment.