1
0
mirror of https://github.com/containers/buildah.git synced 2026-02-05 09:45:38 +01:00

copier: fix linter warnings

Fix a "that doesn't take %w" warning.
Fix two "you forgot to pass that error to the formatter" warnings.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai
2025-11-13 16:02:03 -05:00
parent 87071275ae
commit 2e2bf30aad

View File

@@ -1168,7 +1168,7 @@ func copierHandlerStat(req request, pm *fileutils.PatternMatcher, idMappings *id
hostPair := idtools.IDPair{UID: uid, GID: gid} hostPair := idtools.IDPair{UID: uid, GID: gid}
uid, gid, err = idMappings.ToContainer(hostPair) uid, gid, err = idMappings.ToContainer(hostPair)
if err != nil { if err != nil {
return errorResponse("copier: stat: mapping host filesystem owners %#v to container filesystem owners: %w", hostPair, err) return errorResponse("copier: stat: mapping host filesystem owners %#v to container filesystem owners: %v", hostPair, err)
} }
} }
result.UID, result.GID = int64(uid), int64(gid) result.UID, result.GID = int64(uid), int64(gid)
@@ -2227,7 +2227,7 @@ func copierHandlerMkdir(req request, idMappings *idtools.IDMappings) (*response,
return errorResponse("copier: mkdir: error setting owner of %q to %d:%d: %v", path, dirUID, dirGID, err) return errorResponse("copier: mkdir: error setting owner of %q to %d:%d: %v", path, dirUID, dirGID, err)
} }
if err = chmod(path, dirMode); err != nil { if err = chmod(path, dirMode); err != nil {
return errorResponse("copier: mkdir: error setting permissions on %q to 0%o: %v", path, dirMode) return errorResponse("copier: mkdir: error setting permissions on %q to 0%o: %v", path, dirMode, err)
} }
created = append(created, path) created = append(created, path)
} else { } else {
@@ -2409,7 +2409,7 @@ func copierHandlerEnsure(req request, idMappings *idtools.IDMappings) *response
return errorResponse("copier: ensure: error setting owner of %q to %d:%d: %v", leaf, uid, gid, err) return errorResponse("copier: ensure: error setting owner of %q to %d:%d: %v", leaf, uid, gid, err)
} }
if err = chmod(filepath.Join(req.Root, leaf), mode); err != nil { if err = chmod(filepath.Join(req.Root, leaf), mode); err != nil {
return errorResponse("copier: ensure: error setting permissions on %q to 0%o: %v", leaf, mode) return errorResponse("copier: ensure: error setting permissions on %q to 0%o: %v", leaf, mode, err)
} }
if item.ModTime != nil { if item.ModTime != nil {
if err := os.Chtimes(filepath.Join(req.Root, leaf), *item.ModTime, *item.ModTime); err != nil { if err := os.Chtimes(filepath.Join(req.Root, leaf), *item.ModTime, *item.ModTime); err != nil {