From 0530750d7ecd1292301e494d312af10ec2616d75 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 4 Jan 2025 22:56:29 +0100 Subject: [PATCH] daemon: containerExtractToDir: remove named error return Also move an error check in the branch where it's produced. Signed-off-by: Sebastiaan van Stijn --- daemon/archive_unix.go | 2 +- daemon/archive_windows.go | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/daemon/archive_unix.go b/daemon/archive_unix.go index 9c0f3d85ab..5db36d9bde 100644 --- a/daemon/archive_unix.go +++ b/daemon/archive_unix.go @@ -97,7 +97,7 @@ func (daemon *Daemon) containerArchivePath(container *container.Container, path // noOverwriteDirNonDir is true then it will be an error if unpacking the // given content would cause an existing directory to be replaced with a non- // directory and vice versa. -func (daemon *Daemon) containerExtractToDir(container *container.Container, path string, copyUIDGID, noOverwriteDirNonDir bool, content io.Reader) (err error) { +func (daemon *Daemon) containerExtractToDir(container *container.Container, path string, copyUIDGID, noOverwriteDirNonDir bool, content io.Reader) error { container.Lock() defer container.Unlock() diff --git a/daemon/archive_windows.go b/daemon/archive_windows.go index 91c618bfd6..32f8fc9e4a 100644 --- a/daemon/archive_windows.go +++ b/daemon/archive_windows.go @@ -149,7 +149,7 @@ func (daemon *Daemon) containerArchivePath(container *container.Container, path // directory and vice versa. // // FIXME(thaJeztah): copyUIDGID is not supported on Windows, but currently ignored silently -func (daemon *Daemon) containerExtractToDir(container *container.Container, path string, copyUIDGID, noOverwriteDirNonDir bool, content io.Reader) (err error) { +func (daemon *Daemon) containerExtractToDir(container *container.Container, path string, copyUIDGID, noOverwriteDirNonDir bool, content io.Reader) error { container.Lock() defer container.Unlock() @@ -158,12 +158,12 @@ func (daemon *Daemon) containerExtractToDir(container *container.Container, path return err } - if err = daemon.Mount(container); err != nil { + if err := daemon.Mount(container); err != nil { return err } defer daemon.Unmount(container) - err = daemon.mountVolumes(container) + err := daemon.mountVolumes(container) defer container.DetachAndUnmount(daemon.LogVolumeEvent) if err != nil { return err @@ -224,10 +224,11 @@ func (daemon *Daemon) containerExtractToDir(container *container.Container, path } } else { baseRel, err = filepath.Rel(container.BaseFS, resolvedPath) + if err != nil { + return err + } } - if err != nil { - return err - } + // Make it an absolute path. absPath = filepath.Join(string(filepath.Separator), baseRel)