Skip to content

Commit

Permalink
Merge pull request #109 from manugupt1/propagate-bare-errors
Browse files Browse the repository at this point in the history
Do not wrap errors from filepath / os as they are already wrapped.
  • Loading branch information
thaJeztah committed Apr 7, 2022
2 parents 0335593 + 4ac34a1 commit 925ece2
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions mountinfo/mounted_unix.go
Expand Up @@ -4,7 +4,6 @@
package mountinfo

import (
"fmt"
"os"
"path/filepath"

Expand Down Expand Up @@ -33,13 +32,13 @@ func mountedByStat(path string) (bool, error) {

func normalizePath(path string) (realPath string, err error) {
if realPath, err = filepath.Abs(path); err != nil {
return "", fmt.Errorf("unable to get absolute path for %q: %w", path, err)
return "", err
}
if realPath, err = filepath.EvalSymlinks(realPath); err != nil {
return "", fmt.Errorf("failed to canonicalise path for %q: %w", path, err)
return "", err
}
if _, err := os.Stat(realPath); err != nil {
return "", fmt.Errorf("failed to stat target of %q: %w", path, err)
return "", err
}
return realPath, nil
}
Expand Down

0 comments on commit 925ece2

Please sign in to comment.