InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon/builder/remotecontext: remove detection of system.XattrError

Browse Source 
Both locations checked an error from `filepath.Rel` in stdlib, which
would never return a `system.XattrError`, so this was just dead code.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-07-29 09:36:13 +02:00
parent 1e835a8cf5
commit 4c1ab68c6c
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
daemon/builder/remotecontext/archive.go
View File

@@ -8,7 +8,6 @@ import (
"github.com/docker/docker/daemon/builder"
"github.com/docker/docker/daemon/builder/remotecontext/internal/tarsum"
"github.com/docker/docker/pkg/longpath"
"github.com/docker/docker/pkg/system"
"github.com/moby/go-archive/chrootarchive"
"github.com/moby/go-archive/compression"
"github.com/moby/sys/symlink"
@@ -25,11 +24,10 @@ func (c *archiveContext) Close() error {
}
func convertPathError(err error, cleanpath string) error {
switch err := err.(type) {
case *os.PathError:
err.Path = cleanpath
case *system.XattrError:
err.Path = cleanpath
var pErr *os.PathError
if errors.As(err, &pErr) {
pErr.Path = cleanpath
err = pErr
}
return err
}
@@ -98,14 +96,14 @@ func (c *archiveContext) Remove(path string) error {
}
func (c *archiveContext) Hash(path string) (string, error) {
cleanpath, fullpath, err := normalize(path, c.root)
cleanPath, fullPath, err := normalize(path, c.root)
if err != nil {
return "", err
}
rel, err := filepath.Rel(c.root, fullpath)
rel, err := filepath.Rel(c.root, fullPath)
if err != nil {
return "", convertPathError(err, cleanpath)
return "", convertPathError(err, cleanPath)
}
// Use the checksum of the followed path(not the possible symlink) because