Skip to content

Ensure that intermediate directories exist when unpacking an entry #1098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 1 commit into from
May 17, 2017
Merged

Ensure that intermediate directories exist when unpacking an entry #1098

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/rustup-dist/src/component/package.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,14 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path)
// Throw away the first path component
components.next();
let full_path = path.join(&components.as_path());

// Create the full path to the entry if it does not exist already
match full_path.parent() {
Some(parent) if !parent.exists() =>
try!(::std::fs::create_dir_all(&parent).chain_err(|| ErrorKind::ExtractingPackage)),
_ => (),
};

try!(entry.unpack(&full_path).chain_err(|| ErrorKind::ExtractingPackage));
}

Expand Down
⚡