Skip to content

Commit

Permalink
Flatten the list returned in env["PATH"] into a string.
Browse files Browse the repository at this point in the history
whitequark committed Mar 26, 2018
1 parent 34f4f82 commit 86a850a
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -101,22 +101,22 @@ def condaEnv(use_local=False, extra_vars={}):
else:
env_root = '%(builddir)s\\..\\miniconda'

return [
WithProperties(env_root),
WithProperties(env_root + '\\Scripts'),
WithProperties(env_root + '\\Library\\bin'),
return WithProperties(";".join([
env_root,
env_root + '\\Scripts',
env_root + '\\Library\\bin',
'${PATH}'
]
]))
else: # *nix
if use_local:
env_root = '%(builddir)s/../miniconda/envs/' + conda_env_name
else:
env_root = '%(builddir)s/../miniconda'

return [
WithProperties(env_root + '/bin'),
return WithProperties(":".join([
env_root + '/bin',
'${PATH}'
]
]))

env = {
'PATH': extendPath,

0 comments on commit 86a850a

Please sign in to comment.