smallsolar/postmarketos-mkinitfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

archive: improve error messages (MR 39)

Browse Source 
Improve errors when writing out the cpio archive fails.

Signed-off-by: Caleb Connolly <caleb@connolly.tech>
This commit is contained in:
Caleb Connolly
2023-07-17 17:25:19 +01:00
committed by Clayton Craft
parent 1334fdfa26
commit 866d37b85d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/archive/archive.go
View File

@@ -418,19 +418,19 @@ func (archive *Archive) writeCpio() error {
if header.Mode.IsRegular() { if header.Mode.IsRegular() {
fd, err := os.Open(source) fd, err := os.Open(source)
if err != nil { 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() defer fd.Close()
if _, err := io.Copy(archive.cpioWriter, fd); err != nil { 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 != "" { } else if header.Linkname != "" {
// the contents of a symlink is just need the link name // the contents of a symlink is just need the link name
if _, err := archive.cpioWriter.Write([]byte(header.Linkname)); err != nil { 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 { } 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)
} }
} }