Merge pull request #2006 from bradmwilliams/rpmdiff-permissions-fix

openshift-merge-bot[bot] · web-flow · commit beeaf0904b6e · 2025-04-10T21:35:32.000Z
COS-3023: Fixing rpmdiff permissions when running in container
diff --git a/pkg/cli/image/extract/extract.go b/pkg/cli/image/extract/extract.go
@@ -642,6 +642,8 @@ func (_ removePermissions) Alter(hdr *tar.Header) (bool, error) {
 	default:
 		hdr.Mode = int64(os.FileMode(0755))
 	}
+	hdr.Xattrs = map[string]string{}
+	hdr.PAXRecords = map[string]string{}
 	return true, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -642,6 +642,8 @@ func (_ removePermissions) Alter(hdr *tar.Header) (bool, error) {`
`642`	`642`	`default:`
`643`	`643`	`hdr.Mode = int64(os.FileMode(0755))`
`644`	`644`	`}`
	`645`	`+ hdr.Xattrs = map[string]string{}`
	`646`	`+ hdr.PAXRecords = map[string]string{}`
`645`	`647`	`return true, nil`
`646`	`648`	`}`
`647`	`649`