From 866d37b85dc72c430b941ce9758f5488d2707823 Mon Sep 17 00:00:00 2001 From: Caleb Connolly Date: Mon, 17 Jul 2023 17:25:19 +0100 Subject: [PATCH] archive: improve error messages (MR 39) Improve errors when writing out the cpio archive fails. Signed-off-by: Caleb Connolly --- internal/archive/archive.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/archive/archive.go b/internal/archive/archive.go index ba4502f..7f28119 100644 --- a/internal/archive/archive.go +++ b/internal/archive/archive.go @@ -418,19 +418,19 @@ func (archive *Archive) writeCpio() error { if header.Mode.IsRegular() { fd, err := os.Open(source) if err != nil { - return fmt.Errorf("archive.writeCpio: uname to open file %q, %w", source, err) + return fmt.Errorf("archive.writeCpio: Unable to open file %q, %w", source, err) } defer fd.Close() if _, err := io.Copy(archive.cpioWriter, fd); err != nil { - return fmt.Errorf("archive.writeCpio: unable to write out archive: %w", err) + return fmt.Errorf("archive.writeCpio: Couldn't process %q: %w", source, err) } } else if header.Linkname != "" { // the contents of a symlink is just need the link name if _, err := archive.cpioWriter.Write([]byte(header.Linkname)); err != nil { - return fmt.Errorf("archive.writeCpio: unable to write out symlink: %w", err) + return fmt.Errorf("archive.writeCpio: unable to write out symlink: %q -> %q: %w", source, header.Linkname, err) } } else { - return fmt.Errorf("archive.writeCpio: unknown type for file: %s", source) + return fmt.Errorf("archive.writeCpio: unknown type for file: %q: %d", source, header.Mode) } }