diff options
Diffstat (limited to 'python/servo/bootstrap.py')
| -rw-r--r-- | python/servo/bootstrap.py | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index 35be5c67b92..1357abac14a 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -78,18 +78,28 @@ def salt(context, force=False): # Hence, dynamically generate the config with an appropriate `root_dir` # and serialize it as JSON (which is valid YAML). config = { - 'fileserver_backend': ['git'], - 'gitfs_env_whitelist': 'base', - 'gitfs_provider': 'gitpython', - 'gitfs_remotes': [ - 'https://github.com/servo/saltfs.git', - ], 'hash_type': 'sha384', 'master': 'localhost', 'root_dir': salt_root, 'state_output': 'changes', 'state_tabular': True, } + if 'SERVO_SALTFS_ROOT' in os.environ: + config.update({ + 'fileserver_backend': ['roots'], + 'file_roots': { + 'base': [os.path.abspath(os.environ['SERVO_SALTFS_ROOT'])], + }, + }) + else: + config.update({ + 'fileserver_backend': ['git'], + 'gitfs_env_whitelist': 'base', + 'gitfs_provider': 'gitpython', + 'gitfs_remotes': [ + 'https://github.com/servo/saltfs.git', + ], + }) if not os.path.exists(config_dir): os.makedirs(config_dir, mode=0o700) |