Auto merge of rust-lang#6061 - dwijnand:specify-lockfile-path-in---lo…

…cked-error, r=alexcrichton Specify lockfile path in --locked error msg Fixes rust-lang#4603
alexcrichton · Sep 20, 2018 · 0e3c5f2 · 0e3c5f2
2 parents 7c34b13 + b8c24f3
commit 0e3c5f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/cargo/ops/lockfile.rs b/src/cargo/ops/lockfile.rs
@@ -84,8 +84,9 @@ pub fn write_pkg_lockfile(ws: &Workspace, resolve: &Resolve) -> CargoResult<()>
             "--frozen"
         };
         bail!(
-            "the lock file needs to be updated but {} was passed to \
+            "the lock file {} needs to be updated but {} was passed to \
              prevent this",
+            ws.root().to_path_buf().join("Cargo.lock").display(),
             flag
         );
     }

diff --git a/tests/testsuite/lockfile_compat.rs b/tests/testsuite/lockfile_compat.rs
@@ -480,7 +480,7 @@ fn locked_correct_error() {
         .with_stderr(
             "\
 [UPDATING] `[..]` index
-error: the lock file needs to be updated but --locked was passed to prevent this
+error: the lock file [CWD]/Cargo.lock needs to be updated but --locked was passed to prevent this
 ",
         ).run();
 }