diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-19 13:57:52 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-19 13:57:52 -0600 |
| commit | 82f70c5d501a50d914d69bcd3743d81d5aac69d2 (patch) | |
| tree | 5cacedd42805a67ff0124e5627bbfd2b969691a6 /python/servo/command_base.py | |
| parent | e845695b6674a8f97f6a172bf575e6c965883ff1 (diff) | |
| parent | 4641640d14c5caa7088e38bd0cdfae062adc7156 (diff) | |
| download | servo-82f70c5d501a50d914d69bcd3743d81d5aac69d2.tar.gz servo-82f70c5d501a50d914d69bcd3743d81d5aac69d2.zip | |
auto merge of #5200 : mbrubeck/servo/cache-dir, r=larsbergstrom
This will be set in servo/saltfs to prevent our buildbot builders from re-downloading the build tools for every build.
r? @larsbergstrom or @metajack or @Manishearth
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 25ed18bb29a..5b3ad797c03 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -69,8 +69,9 @@ class CommandBase(object): # Handle missing/default items self.config.setdefault("tools", {}) - self.config["tools"].setdefault("cache-dir", - path.join(context.topdir, ".servo")) + default_cache_dir = os.environ.get("SERVO_CACHE_DIR", + path.join(context.topdir, ".servo")) + self.config["tools"].setdefault("cache-dir", default_cache_dir) resolverelative("tools", "cache-dir") self.config["tools"].setdefault("cargo-home-dir", |