Skip to content

Improve experience with package errors #78

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
hugelgupf merged 2 commits into from
Dec 25, 2022
Merged

Improve experience with package errors #78

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
0c6584c
Improve experience with package errors
hugelgupf Dec 25, 2022
21b2408
Return error when package is added
hugelgupf Dec 25, 2022
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: 13 additions & 0 deletions deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,19 @@ def go_dependencies():
sum = "h1:CVuJwN34x4xM2aT4sIKhmeib40NeBPhRihNjQmpJsA4=",
version = "v0.0.0-20200907032337-555d40f16ae2",
)
go_repository(
name = "com_github_hashicorp_errwrap",
importpath = "github.com/hashicorp/errwrap",
sum = "h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=",
version = "v1.0.0",
)
go_repository(
name = "com_github_hashicorp_go_multierror",
importpath = "github.com/hashicorp/go-multierror",
sum = "h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=",
version = "v1.1.1",
)

go_repository(
name = "com_github_u_root_uio",
importpath = "github.com/u-root/uio",
Expand Down
1 change: 1 addition & 0 deletions src/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go 1.13

require (
github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2
github.com/hashicorp/go-multierror v1.1.1
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654
Expand Down
4 changes: 4 additions & 0 deletions src/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2 h1:CVuJwN34x4xM2aT4sIKhmeib40NeBPhRihNjQmpJsA4=
github.com/google/goterm v0.0.0-20200907032337-555d40f16ae2/go.mod h1:nOFQdrUlIlx6M6ODdSpBj1NVA+VgLC6kmw60mkw34H4=
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 h1:XMAtQHwKjWHIRwg+8Nj/rzUomQY1q6cM3ncA0wP8GU4=
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
Expand Down
1 change: 1 addition & 0 deletions src/pkg/bb/findpkg/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ go_library(
deps = [
"//src/pkg/bb/bbinternal",
"//src/pkg/golang",
"@com_github_hashicorp_go_multierror//:go-multierror",
"@com_github_u_root_uio//ulog",
"@org_golang_x_sys//unix",
"@org_golang_x_tools//go/packages",
Expand Down
11 changes: 9 additions & 2 deletions src/pkg/bb/findpkg/bb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"golang.org/x/sys/unix"
"golang.org/x/tools/go/packages"

"github.com/hashicorp/go-multierror"
"github.com/u-root/gobusybox/src/pkg/bb/bbinternal"
"github.com/u-root/gobusybox/src/pkg/golang"
"github.com/u-root/uio/ulog"
Expand Down Expand Up @@ -113,8 +114,11 @@ func loadFSPackages(l ulog.Logger, env golang.Environ, filesystemPaths []string)

func addPkg(l ulog.Logger, plist []*packages.Package, p *packages.Package) ([]*packages.Package, error) {
if len(p.Errors) > 0 {
packages.PrintErrors([]*packages.Package{p})
return plist, fmt.Errorf("failed to add package %v for errors:", p)
var merr error
for _, e := range p.Errors {
merr = multierror.Append(merr, e)
}
return plist, fmt.Errorf("failed to add package %v for errors: %v", p, merr)
} else if len(p.GoFiles) == 0 {
l.Printf("Skipping package %v because it has no Go files", p)
} else if p.Name != "main" {
Expand Down Expand Up @@ -150,6 +154,9 @@ func NewPackages(l ulog.Logger, env golang.Environ, names ...string) ([]*bbinter
}
for _, p := range importPkgs {
ps, err = addPkg(l, ps, p)
if err != nil {
return nil, err
}
}
}

Expand Down