Skip to content
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.

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

Fix tar2vhd on specific unordered tars #1012

Merged
merged 1 commit into from
Apr 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions ext4/internal/compactext4/compact.go
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,9 @@ func (w *Writer) lookup(name string, mustExist bool) (*inode, *inode, string, er
// call to make these parent directories will be made at a later point with the correct
// permissions, at that time the permissions of these directories will be updated.
func (w *Writer) CreateWithParents(name string, f *File) error {
if err := w.finishInode(); err != nil {
return err
}
// go through the directories in the path one by one and create the
// parent directories if they don't exist.
cleanname := path.Clean("/" + name)[1:]
Expand Down
2 changes: 1 addition & 1 deletion ext4/tar2ext4/tar2ext4_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ func Test_UnorderedTarExpansion(t *testing.T) {
var files = []struct {
path, body string
}{
{"foo/bar.txt", "inside bar.txt"},
{"data/", ""},
{"root.txt", "inside root.txt"},
{"foo/bar.txt", "inside bar.txt"},
{"foo/", ""},
{"A/B/b.txt", "inside b.txt"},
{"A/a.txt", "inside a.txt"},
Expand Down