containers
/
storage
mirror of https://github.com/containers/storage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

check: adapt to work with ForceMask 

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2024-12-05 16:42:01 +01:00
parent b78a599588
commit 84e750286e
No known key found for this signature in database
GPG Key ID: 67E38F7A8BA21772
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
check.go
View File

@ -80,7 +80,7 @@ type CheckOptions struct {
// layer to the contents that we'd expect it to have to ignore certain // layer to the contents that we'd expect it to have to ignore certain
// discrepancies // discrepancies
type checkIgnore struct { type checkIgnore struct {
ownership, timestamps, permissions bool ownership, timestamps, permissions, filetype bool
} }
// CheckMost returns a CheckOptions with mostly just "quick" checks enabled. // CheckMost returns a CheckOptions with mostly just "quick" checks enabled.
@ -139,8 +139,10 @@ func (s *store) Check(options *CheckOptions) (CheckReport, error) {
if strings.Contains(o, "ignore_chown_errors=true") { if strings.Contains(o, "ignore_chown_errors=true") {
ignore.ownership = true ignore.ownership = true
} }
if strings.HasPrefix(o, "force_mask=") { if strings.Contains(o, "force_mask=") {
ignore.ownership = true
ignore.permissions = true ignore.permissions = true
ignore.filetype = true
} }
} }
for o := range s.pullOptions { for o := range s.pullOptions {
@ -833,7 +835,7 @@ func (s *store) Repair(report CheckReport, options *RepairOptions) []error {
// compareFileInfo returns a string summarizing what's different between the two checkFileInfos // compareFileInfo returns a string summarizing what's different between the two checkFileInfos
func compareFileInfo(a, b checkFileInfo, idmap *idtools.IDMappings, ignore checkIgnore) string { func compareFileInfo(a, b checkFileInfo, idmap *idtools.IDMappings, ignore checkIgnore) string {
var comparison []string var comparison []string
if a.typeflag != b.typeflag { if a.typeflag != b.typeflag && !ignore.filetype {
comparison = append(comparison, fmt.Sprintf("filetype:%v￫%v", a.typeflag, b.typeflag)) comparison = append(comparison, fmt.Sprintf("filetype:%v￫%v", a.typeflag, b.typeflag))
} }
if idmap != nil && !idmap.Empty() { if idmap != nil && !idmap.Empty() {