From: jluner <justin.j.luner@gmail.com>
Date: Sat, 27 May 2017 07:29:15 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6e9161b38e16af4a5f8e63cbe3068abca9dc8321;p=cargo.git

Merge remote-tracking branch 'upstream/master'
---

6e9161b38e16af4a5f8e63cbe3068abca9dc8321
diff --cc src/cargo/util/flock.rs
index a4621dbea,861dd4f73..1be77b2d8
--- a/src/cargo/util/flock.rs
+++ b/src/cargo/util/flock.rs
@@@ -289,10 -288,10 +289,10 @@@ fn acquire(config: &Config
          }
      }
      let msg = format!("waiting for file lock on {}", msg);
-     config.shell().err().say_status("Blocking", &msg, CYAN, true)?;
+     config.shell().status_with_color("Blocking", &msg, CYAN)?;
  
 -    return block().chain_error(|| {
 -        human(format!("failed to lock file: {}", path.display()))
 +    return block().chain_err(|| {
 +        format!("failed to lock file: {}", path.display())
      });
  
      #[cfg(all(target_os = "linux", not(target_env = "musl")))]