mirror of
https://github.com/containers/podman.git
synced 2025-12-03 03:39:44 +08:00
update buildah and c/common to latest
also includes bumps for c/storage and c/image Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
8
vendor/github.com/containers/buildah/copier/xattrs.go
generated
vendored
8
vendor/github.com/containers/buildah/copier/xattrs.go
generated
vendored
@@ -4,12 +4,12 @@
|
||||
package copier
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"syscall"
|
||||
|
||||
"github.com/containers/buildah/util"
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
@@ -45,11 +45,11 @@ func Lgetxattrs(path string) (map[string]string, error) {
|
||||
list = make([]byte, listSize)
|
||||
size, err := unix.Llistxattr(path, list)
|
||||
if err != nil {
|
||||
if util.Cause(err) == syscall.ERANGE {
|
||||
if errors.Is(err, syscall.ERANGE) {
|
||||
listSize *= 2
|
||||
continue
|
||||
}
|
||||
if (util.Cause(err) == syscall.ENOTSUP) || (util.Cause(err) == syscall.ENOSYS) {
|
||||
if errors.Is(err, syscall.ENOTSUP) || errors.Is(err, syscall.ENOSYS) {
|
||||
// treat these errors listing xattrs as equivalent to "no xattrs"
|
||||
list = list[:0]
|
||||
break
|
||||
@@ -71,7 +71,7 @@ func Lgetxattrs(path string) (map[string]string, error) {
|
||||
attributeValue = make([]byte, attributeSize)
|
||||
size, err := unix.Lgetxattr(path, attribute, attributeValue)
|
||||
if err != nil {
|
||||
if util.Cause(err) == syscall.ERANGE {
|
||||
if errors.Is(err, syscall.ERANGE) {
|
||||
attributeSize *= 2
|
||||
continue
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user