Merge pull request #767 from rust-lang-nursery/db-empty-cargodir

Treat an empty `CARGO_HOME` the same as an unset `CARGO_HOME`
rust-lang · Oct 21, 2016 · e88d503 · e88d503
2 parents d32ae1a + 49d6606
commit e88d503
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/rustup-utils/src/utils.rs b/src/rustup-utils/src/utils.rs
@@ -479,7 +479,8 @@ pub fn cargo_home() -> Result<PathBuf> {
     let env_var = if let Some(v) = env_var {
        let vv = v.to_string_lossy().to_string();
        if vv.contains(".multirust/cargo") ||
-            vv.contains(r".multirust\cargo") {
+            vv.contains(r".multirust\cargo") ||
+            vv.trim().is_empty() {
            None
        } else {
            Some(v)