From: Gabriel Féron <feron.gabriel@gmail.com>
Date: Tue, 29 May 2018 09:05:34 +0000 (+0200)
Subject: Add more instructions to error message
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2^2~14^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=53480ac7c710ec1c276213e85b859943e17704a1;p=cargo.git

Add more instructions to error message
---

diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs
index 84115a6da..2b55b19d1 100644
--- a/src/cargo/ops/cargo_package.rs
+++ b/src/cargo/ops/cargo_package.rs
@@ -360,8 +360,9 @@ fn run_verify(ws: &Workspace, tar: &FileLock, opts: &PackageOpts) -> CargoResult
         bail!(
             "Source directory was modified by build.rs during cargo publish. \
              Build scripts should not modify anything outside of OUT_DIR. \
-             Modified file: {}",
-             path.display()
+             Modified file: {}\n\n\
+             To proceed despite this, pass the `--no-verify` flag.",
+            path.display()
         )
     }
 
diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs
index beb650c72..fde31b76c 100644
--- a/tests/testsuite/package.rs
+++ b/tests/testsuite/package.rs
@@ -1442,7 +1442,17 @@ fn do_not_package_if_src_was_modified() {
 
     assert_that(
         p.cargo("package"),
-        execs().with_status(101),
+        execs().with_status(101)
+               .with_stderr_contains(
+                   "\
+error: failed to verify package tarball
+
+Caused by:
+  Source directory was modified by build.rs during cargo publish. \
+Build scripts should not modify anything outside of OUT_DIR. Modified file: [..]src/generated.txt
+
+To proceed despite this, pass the `--no-verify` flag.",
+               ),
     );
 
     assert_that(