Skip to content

Fix symlink resolution error message #745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2024
Merged

Fix symlink resolution error message #745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c30ca0f
Fix typo in error message
elezar Oct 17, 2024
cdf39fb
[no-relnote] Use symlinks.Resolve in hook
elezar Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions cmd/nvidia-cdi-hook/create-symlinks/create-symlinks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,21 +211,14 @@ func changeRoot(current string, new string, path string) (string, error) {
// Locate returns the link target of the specified filename or an empty slice if the
// specified filename is not a symlink.
func (m command) Locate(filename string) ([]string, error) {
info, err := os.Lstat(filename)
target, err := symlinks.Resolve(filename)
if err != nil {
return nil, fmt.Errorf("failed to get file info: %v", info)
return nil, err
}
if info.Mode()&os.ModeSymlink == 0 {
if target == filename {
m.logger.Debugf("%v is not a symlink", filename)
return nil, nil
}

target, err := os.Readlink(filename)
if err != nil {
return nil, fmt.Errorf("error checking symlink: %v", err)
}

m.logger.Debugf("Resolved link: '%v' => '%v'", filename, target)

return []string{target}, nil
}
2 changes: 1 addition & 1 deletion internal/lookup/symlinks/symlink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
func Resolve(filename string) (string, error) {
info, err := os.Lstat(filename)
if err != nil {
return filename, fmt.Errorf("failed to get file info: %v", info)
return filename, fmt.Errorf("failed to get file info: %w", err)
}
if info.Mode()&os.ModeSymlink == 0 {
return filename, nil
Expand Down