Skip to content
Open
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
47 changes: 28 additions & 19 deletions pkg/apk/apk/installed.go
Original file line number Diff line number Diff line change
Expand Up @@ -338,27 +338,36 @@ func ParseInstalled(installed io.Reader) ([]*InstalledPackage, error) { //nolint
fullpath, _ = sanitizeArchivePath(lastDir.Name, val)
}
lastFile = &tar.Header{
Name: fullpath,
Mode: 0o644,
Uid: 0,
Gid: 0,
}
pkg.Files = append(pkg.Files, *lastFile)
case "a":
// file perms if not 0o644
if lastFile == nil {
return nil, fmt.Errorf("cannot parse line %d: no file specified when setting permissions", linenr)
}
uid, gid, perms, err := parseInstalledPerms(val)
if err != nil {
return nil, fmt.Errorf("cannot parse line %d: %w", linenr, err)
}
lastFile.Uid = uid
lastFile.Gid = gid
lastFile.Mode = perms
Name: fullpath,
Mode: 0o644,
Uid: 0,
Gid: 0,
}
pkg.Files = append(pkg.Files, *lastFile)
case "a":
// file perms if not 0o644
if lastFile == nil {
return nil, fmt.Errorf("cannot parse line %d: no file specified when setting permissions", linenr)
}
uid, gid, perms, err := parseInstalledPerms(val)
if err != nil {
return nil, fmt.Errorf("cannot parse line %d: %w", linenr, err)
}
lastFile.Uid = uid
lastFile.Gid = gid
lastFile.Mode = perms
case "Z":
// file checksum
if lastFile == nil {
return nil, fmt.Errorf("cannot parse line %d: no file specified when setting checksum", linenr)
}
if lastFile.PAXRecords == nil {
lastFile.PAXRecords = make(map[string]string)
}
lastFile.PAXRecords[paxRecordsChecksumKey] = val
}

linenr++
linenr++
}

return packages, nil
Expand Down