mirror of
https://github.com/containers/podman.git
synced 2025-12-13 18:37:36 +08:00
Bump github.com/containers/storage from 1.32.3 to 1.32.5
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.32.3 to 1.32.5. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/main/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.32.3...v1.32.5) --- updated-dependencies: - dependency-name: github.com/containers/storage dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
16
vendor/github.com/containers/buildah/copier/copier.go
generated
vendored
16
vendor/github.com/containers/buildah/copier/copier.go
generated
vendored
@@ -1745,14 +1745,6 @@ func copierHandlerPut(bulkReader io.Reader, req request, idMappings *idtools.IDM
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "copier: put: error creating %q", path)
|
||||
}
|
||||
// restore xattrs
|
||||
if !req.PutOptions.StripXattrs {
|
||||
if err = Lsetxattrs(path, hdr.Xattrs); err != nil { // nolint:staticcheck
|
||||
if !req.PutOptions.IgnoreXattrErrors {
|
||||
return errors.Wrapf(err, "copier: put: error setting extended attributes on %q", path)
|
||||
}
|
||||
}
|
||||
}
|
||||
// set ownership
|
||||
if err = lchown(path, hdr.Uid, hdr.Gid); err != nil {
|
||||
return errors.Wrapf(err, "copier: put: error setting ownership of %q to %d:%d", path, hdr.Uid, hdr.Gid)
|
||||
@@ -1778,6 +1770,14 @@ func copierHandlerPut(bulkReader io.Reader, req request, idMappings *idtools.IDM
|
||||
return errors.Wrapf(err, "error setting additional permissions on %q to 0%o", path, mode)
|
||||
}
|
||||
}
|
||||
// set xattrs, including some that might have been reset by chown()
|
||||
if !req.PutOptions.StripXattrs {
|
||||
if err = Lsetxattrs(path, hdr.Xattrs); err != nil { // nolint:staticcheck
|
||||
if !req.PutOptions.IgnoreXattrErrors {
|
||||
return errors.Wrapf(err, "copier: put: error setting extended attributes on %q", path)
|
||||
}
|
||||
}
|
||||
}
|
||||
// set time
|
||||
if hdr.AccessTime.IsZero() || hdr.AccessTime.Before(hdr.ModTime) {
|
||||
hdr.AccessTime = hdr.ModTime
|
||||
|
||||
Reference in New Issue
Block a user