opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-15 02:29:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump github.com/containers/storage from 1.24.4 to 1.24.5

Browse Source 
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.24.4 to 1.24.5.
- [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.24.4...v1.24.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
dependabot-preview[bot]
2021-01-11 10:23:37 +00:00
committed by Daniel J Walsh
parent 41613bdb96
commit 63ecd1215a
13 changed files with 96 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
vendor/github.com/containers/storage/pkg/idtools/idtools.go generated vendored
View File

@@ -77,13 +77,23 @@ func MkdirAllAndChownNew(path string, mode os.FileMode, ids IDPair) error {
// GetRootUIDGID retrieves the remapped root uid/gid pair from the set of maps.
// If the maps are empty, then the root uid/gid will default to "real" 0/0
func GetRootUIDGID(uidMap, gidMap []IDMap) (int, int, error) {
uid, err := toHost(0, uidMap)
if err != nil {
return -1, -1, err
var uid, gid int
var err error
if len(uidMap) == 1 && uidMap[0].Size == 1 {
uid = uidMap[0].HostID
} else {
uid, err = toHost(0, uidMap)
if err != nil {
return -1, -1, err
}
}
gid, err := toHost(0, gidMap)
if err != nil {
return -1, -1, err
if len(gidMap) == 1 && gidMap[0].Size == 1 {
gid = gidMap[0].HostID
} else {
gid, err = toHost(0, gidMap)
if err != nil {
return -1, -1, err
}
}
return uid, gid, nil
}