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
servo · Mar 19, 2015 · 82f70c5 · 82f70c5
2 parents e845695 + 4641640
commit 82f70c5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
@@ -69,8 +69,9 @@ def resolverelative(category, key):
 
         # 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",