From d78c6d5a62e88e836759c5aae5b2415789b3d42c Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Sat, 10 Sep 2022 00:28:24 -0700 Subject: [PATCH] archive: wrap errors from Write() (MR 22) --- pkgs/archive/archive.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/archive/archive.go b/pkgs/archive/archive.go index 4254914..01fd848 100644 --- a/pkgs/archive/archive.go +++ b/pkgs/archive/archive.go @@ -47,17 +47,16 @@ func (archive *Archive) Write(path string, mode os.FileMode) error { } if err := archive.cpioWriter.Close(); err != nil { - return err + return fmt.Errorf("archive.Write: error closing archive: %w", err) } // Write archive to path if err := archive.writeCompressed(path, mode); err != nil { - log.Print("Unable to write archive to location: ", path) - return err + return fmt.Errorf("unable to write archive to location %q: %w", path, err) } if err := os.Chmod(path, mode); err != nil { - return err + return fmt.Errorf("unable to chmod %q to %s: %w", path, mode, err) } return nil