diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-11 11:37:05 -0700 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-11 11:37:05 -0700 |
| commit | fcebfcc1130b7b3e74f14c8375f825f148e0f152 (patch) | |
| tree | c5b418fbde45cb1255ef030eced7d29a27be8380 | |
| parent | 392135bd0c2f512a0d632a7d76e667bc9af8f4a7 (diff) | |
| parent | ce5d9bc819ff217d681c6edd2266daf5fad2b8f6 (diff) | |
| download | servo-fcebfcc1130b7b3e74f14c8375f825f148e0f152.tar.gz servo-fcebfcc1130b7b3e74f14c8375f825f148e0f152.zip | |
Auto merge of #11135 - mbrubeck:cargo-home, r=larsbergstrom
Override $CARGO_HOME only if cargo-home-dir is in .servobuild
This preserves the fix from #11097 in the situation where `$CARGO_HOME` and `cargo-home-dir` in `.servobuild` are both present: `.servobuild` should win.
But it changes the behavior when `$CARGO_HOME` is present and `.servobuild` is not: Then `$CARGO_HOME` should be used.
We now check the following values in order of priority and use the first one that is found:
1. `cargo-home-dir` in `.servobuild`
2. `CARGO_HOME` in the environment
3. default value (`<servo-repo>/.cargo`)
r? @larsbergstrom
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11135)
<!-- Reviewable:end -->
| -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 0b51bf93dc6..492aefda254 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -149,8 +149,9 @@ class CommandBase(object): self.config["tools"].setdefault("cache-dir", default_cache_dir) resolverelative("tools", "cache-dir") - self.config["tools"].setdefault("cargo-home-dir", - path.join(context.topdir, ".cargo")) + default_cargo_home = os.environ.get("CARGO_HOME", + path.join(context.topdir, ".cargo")) + self.config["tools"].setdefault("cargo-home-dir", default_cargo_home) resolverelative("tools", "cargo-home-dir") context.sharedir = self.config["tools"]["cache-dir"] |