Auto merge of #6257 - khionu:master, r=alexcrichton

bors · bors · commit 6411d39687b4 · 2018-11-05T17:33:14.000Z
Configure tar to not set mtime This PR is fixes #6238. Currently uses a `patch` on `tar`, and should not be merged until `tar` makes a release containing the function `set_preserve_mtime`.
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,7 +50,7 @@ serde_derive = "1.0"
 serde_ignored = "0.0.4"
 serde_json = { version = "1.0.30", features = ["raw_value"] }
 shell-escape = "0.1.4"
-tar = { version = "0.4.15", default-features = false }
+tar = { version = "0.4.18", default-features = false }
 tempfile = "3.0"
 termcolor = "1.0"
 toml = "0.4.2"
diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs
@@ -418,6 +418,9 @@ fn run_verify(ws: &Workspace, tar: &FileLock, opts: &PackageOpts) -> CargoResult
         paths::remove_dir_all(&dst)?;
     }
     let mut archive = Archive::new(f);
+    // We don't need to set the Modified Time, as it's not relevant to verification
+    // and it errors on filesystems that don't support setting a modified timestamp
+    archive.set_preserve_mtime(false);
     archive.unpack(dst.parent().unwrap())?;
 
     // Manufacture an ephemeral workspace to ensure that even if the top-level

Original file line number	Diff line number	Diff line change
`@@ -418,6 +418,9 @@ fn run_verify(ws: &Workspace, tar: &FileLock, opts: &PackageOpts) -> CargoResult`
`418`	`418`	`paths::remove_dir_all(&dst)?;`
`419`	`419`	`}`
`420`	`420`	`let mut archive = Archive::new(f);`
	`421`	`+ // We don't need to set the Modified Time, as it's not relevant to verification`
	`422`	`+ // and it errors on filesystems that don't support setting a modified timestamp`
	`423`	`+ archive.set_preserve_mtime(false);`
`421`	`424`	`archive.unpack(dst.parent().unwrap())?;`
`422`	`425`
`423`	`426`	`// Manufacture an ephemeral workspace to ensure that even if the top-level`