Skip to content

Update test_helper for safe recasting of file permissions #73

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

Draft
geofffranks wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update test_helper for safe recasting of file permissions #73

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
10 changes: 5 additions & 5 deletions extractor/test_helper/archiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
type ArchiveFile struct {
Name string
Body string
Mode int64
Mode os.FileMode
Dir bool
Link string
Xattrs map[string]string
Expand All @@ -37,9 +37,9 @@ func CreateZipArchive(filename string, files []ArchiveFile) {
}

if file.Link != "" {
header.SetMode(os.FileMode(mode) | os.ModeSymlink)
header.SetMode(mode | os.ModeSymlink)
} else {
header.SetMode(os.FileMode(mode))
header.SetMode(mode)
}

f, err := w.CreateHeader(header)
Expand Down Expand Up @@ -107,12 +107,12 @@ func WriteTar(destination io.Writer, files []ArchiveFile) {
Name: file.Name,
Typeflag: tar.TypeSymlink,
Linkname: file.Link,
Mode: file.Mode,
Mode: int64(file.Mode),
}
} else {
header = &tar.Header{
Name: file.Name,
Mode: mode,
Mode: int64(mode),
Size: int64(len(file.Body)),
}
}
Expand Down