mirror of
https://github.com/containers/podman.git
synced 2025-12-12 01:38:04 +08:00
build(deps): bump github.com/containers/storage from 1.15.7 to 1.15.8
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.15.7 to 1.15.8. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.15.7...v1.15.8) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
committed by
Valentin Rothberg
parent
4699d5e02d
commit
94453c85c7
18
vendor/github.com/containers/storage/pkg/archive/archive.go
generated
vendored
18
vendor/github.com/containers/storage/pkg/archive/archive.go
generated
vendored
@@ -68,6 +68,12 @@ type (
|
||||
}
|
||||
)
|
||||
|
||||
const (
|
||||
tarExt = "tar"
|
||||
solaris = "solaris"
|
||||
windows = "windows"
|
||||
)
|
||||
|
||||
// Archiver allows the reuse of most utility functions of this package with a
|
||||
// pluggable Untar function. To facilitate the passing of specific id mappings
|
||||
// for untar, an archiver can be created with maps which will then be passed to
|
||||
@@ -325,15 +331,15 @@ func ReplaceFileTarWrapper(inputTarStream io.ReadCloser, mods map[string]TarModi
|
||||
func (compression *Compression) Extension() string {
|
||||
switch *compression {
|
||||
case Uncompressed:
|
||||
return "tar"
|
||||
return tarExt
|
||||
case Bzip2:
|
||||
return "tar.bz2"
|
||||
return tarExt + ".bz2"
|
||||
case Gzip:
|
||||
return "tar.gz"
|
||||
return tarExt + ".gz"
|
||||
case Xz:
|
||||
return "tar.xz"
|
||||
return tarExt + ".xz"
|
||||
case Zstd:
|
||||
return "tar.zst"
|
||||
return tarExt + ".zst"
|
||||
}
|
||||
return ""
|
||||
}
|
||||
@@ -670,7 +676,7 @@ func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, L
|
||||
}
|
||||
|
||||
// Lchown is not supported on Windows.
|
||||
if Lchown && runtime.GOOS != "windows" {
|
||||
if Lchown && runtime.GOOS != windows {
|
||||
if chownOpts == nil {
|
||||
chownOpts = &idtools.IDPair{UID: hdr.Uid, GID: hdr.Gid}
|
||||
}
|
||||
|
||||
10
vendor/github.com/containers/storage/pkg/archive/changes_unix.go
generated
vendored
10
vendor/github.com/containers/storage/pkg/archive/changes_unix.go
generated
vendored
@@ -13,17 +13,17 @@ import (
|
||||
|
||||
func statDifferent(oldStat *system.StatT, oldInfo *FileInfo, newStat *system.StatT, newInfo *FileInfo) bool {
|
||||
// Don't look at size for dirs, its not a good measure of change
|
||||
oldUid, oldGid := oldStat.UID(), oldStat.GID()
|
||||
oldUID, oldGID := oldStat.UID(), oldStat.GID()
|
||||
uid, gid := newStat.UID(), newStat.GID()
|
||||
if cuid, cgid, err := newInfo.idMappings.ToContainer(idtools.IDPair{UID: int(uid), GID: int(gid)}); err == nil {
|
||||
uid = uint32(cuid)
|
||||
gid = uint32(cgid)
|
||||
if oldcuid, oldcgid, err := oldInfo.idMappings.ToContainer(idtools.IDPair{UID: int(oldUid), GID: int(oldGid)}); err == nil {
|
||||
oldUid = uint32(oldcuid)
|
||||
oldGid = uint32(oldcgid)
|
||||
if oldcuid, oldcgid, err := oldInfo.idMappings.ToContainer(idtools.IDPair{UID: int(oldUID), GID: int(oldGID)}); err == nil {
|
||||
oldUID = uint32(oldcuid)
|
||||
oldGID = uint32(oldcgid)
|
||||
}
|
||||
}
|
||||
ownerChanged := uid != oldUid || gid != oldGid
|
||||
ownerChanged := uid != oldUID || gid != oldGID
|
||||
if oldStat.Mode() != newStat.Mode() ||
|
||||
ownerChanged ||
|
||||
oldStat.Rdev() != newStat.Rdev() ||
|
||||
|
||||
2
vendor/github.com/containers/storage/pkg/archive/diff.go
generated
vendored
2
vendor/github.com/containers/storage/pkg/archive/diff.go
generated
vendored
@@ -68,7 +68,7 @@ func UnpackLayer(dest string, layer io.Reader, options *TarOptions) (size int64,
|
||||
// specific or Linux-specific, this warning should be changed to an error
|
||||
// to cater for the situation where someone does manage to upload a Linux
|
||||
// image but have it tagged as Windows inadvertently.
|
||||
if runtime.GOOS == "windows" {
|
||||
if runtime.GOOS == windows {
|
||||
if strings.Contains(hdr.Name, ":") {
|
||||
logrus.Warnf("Windows: Ignoring %s (is this a Linux image?)", hdr.Name)
|
||||
continue
|
||||
|
||||
Reference in New Issue
Block a user