mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #80397 - Mark-Simulacrum:fix-bare-tarball, r=pietroalbini

Browse Source 
Use package name for top-level directory in bare tarballs

This fixes a bug introduced by #79788.

r? `@pietroalbini`
This commit is contained in:
bors 2020-12-28 08:29:02 +00:00
commit aef92d44e4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bootstrap/tarball.rs
View File

@ -241,10 +241,16 @@ impl<'a> Tarball<'a> {
} }
pub(crate) fn bare(self) -> PathBuf { pub(crate) fn bare(self) -> PathBuf {
// Bare tarballs should have the top level directory match the package
// name, not "image". We rename the image directory just before passing
// into rust-installer.
let dest = self.temp_dir.join(self.package_name());
t!(std::fs::rename(&self.image_dir, &dest));
self.run(|this, cmd| { self.run(|this, cmd| {
cmd.arg("tarball") cmd.arg("tarball")
.arg("--input") .arg("--input")
.arg(&this.image_dir) .arg(&dest)
.arg("--output") .arg("--output")
.arg(crate::dist::distdir(this.builder).join(this.package_name())); .arg(crate::dist::distdir(this.builder).join(this.package_name()));
}) })