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

getBinaryDeps: wrap errors that are returned (MR 22)

Browse Source
This commit is contained in:
Clayton Craft
2022-09-09 22:56:04 -07:00
parent 28eed4fd12
commit 1e00f8f1cc
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main.go
View File

@@ -180,16 +180,14 @@ func getBinaryDeps(file string) (files []string, err error) {
// if file is a symlink, resolve dependencies for target // if file is a symlink, resolve dependencies for target
fileStat, err := os.Lstat(file) fileStat, err := os.Lstat(file)
if err != nil { if err != nil {
log.Print("getBinaryDeps: failed to stat file") return nil, fmt.Errorf("getBinaryDeps: failed to stat file %q: %w", file, err)
return files, err
} }
// Symlink: write symlink to archive then set 'file' to link target // Symlink: write symlink to archive then set 'file' to link target
if fileStat.Mode()&os.ModeSymlink != 0 { if fileStat.Mode()&os.ModeSymlink != 0 {
target, err := os.Readlink(file) target, err := os.Readlink(file)
if err != nil { if err != nil {
log.Print("getBinaryDeps: unable to read symlink: ", file) return nil, fmt.Errorf("getBinaryDeps: unable to read symlink %q: %w", file, err)
return files, err
} }
if !filepath.IsAbs(target) { if !filepath.IsAbs(target) {
target, err = misc.RelativeSymlinkTargetToDir(target, filepath.Dir(file)) target, err = misc.RelativeSymlinkTargetToDir(target, filepath.Dir(file))
@@ -208,7 +206,7 @@ func getBinaryDeps(file string) (files []string, err error) {
// get dependencies for binaries // get dependencies for binaries
fd, err := elf.Open(file) fd, err := elf.Open(file)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("getBinaryDeps: unable to open elf binary %q: %w", file, err)
} }
libs, _ := fd.ImportedLibraries() libs, _ := fd.ImportedLibraries()
fd.Close() fd.Close()
@@ -235,7 +233,7 @@ func getBinaryDeps(file string) (files []string, err error) {
} }
} }
if !found { if !found {
return nil, fmt.Errorf("Unable to locate dependency for %q: %s", file, lib) return nil, fmt.Errorf("getBinaryDeps: unable to locate dependency for %q: %s", file, lib)
} }
} }