Skip to content
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

Jump to bottom

Remove symlinks also from dependencies. #303

Merged
merged 3 commits into from
Jun 30, 2020
Merged

Remove symlinks also from dependencies. #303

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c15294
Remove symlinks also from dependencies.
mplzik Jun 26, 2020
a459cb8
Fail early if symlink can't be resolved.
mplzik Jun 26, 2020
21a6227
Return error instead of failing.
mplzik Jun 30, 2020
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
Prev Previous commit
Return error instead of failing. 
Signed-off-by: Milan Plzik <milan.plzik@grafana.com>
  • Loading branch information
@mplzik
mplzik committed Jun 30, 2020
commit 21a622751a5fe272b7de82f5a787586e8012ad1e
3 changes: 1 addition & 2 deletions pkg/jsonnet/imports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package jsonnet

import (
"io/ioutil"
"log"
"path/filepath"
"sort"

Expand Down Expand Up @@ -61,7 +60,7 @@ func TransitiveImports(dir string) ([]string, error) {
// Try to resolve any symlinks; use the original path as a last resort
p, err := filepath.EvalSymlinks(k)
if err != nil {
log.Fatalln("Failed to resolve symlink: ", err)
return nil, errors.Wrap(err, "resolving symlinks")
}
paths = append(paths, p)

Expand Down