Skip to content

Exit immediately when reading a repo fails #191

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

Open
r0mflip wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Exit immediately when reading a repo fails #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion cli/available/available.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,11 @@ func (cmd *availableCmd) Execute(ctx context.Context, f *flag.FlagSet, _ ...inte
}

m := make(map[string][]string)
rm := downloader.AvailableVersions(ctx, repos, settings.CacheDir(), settings.CacheLife)
rm, err := downloader.AvailableVersions(ctx, repos, settings.CacheDir(), settings.CacheLife)
if err != nil {
logger.Errorf("Failed to download repos: %v", err)
return subcommands.ExitFailure
}
for u, r := range rm {
for _, p := range r.Packages {
m[u] = append(m[u], p.PackageSpec.Name+"."+p.PackageSpec.Arch+"."+p.PackageSpec.Version)
Expand Down
6 changes: 5 additions & 1 deletion cli/check/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@ func (cmd *checkCmd) Execute(ctx context.Context, f *flag.FlagSet, _ ...interfac
return subcommands.ExitFailure
}

rm := downloader.AvailableVersions(ctx, repos, cache, settings.CacheLife)
rm, err := downloader.AvailableVersions(ctx, repos, cache, settings.CacheLife)
if err != nil {
logger.Errorf("Failed to download repos: %v", err)
return subcommands.ExitFailure
}
unmanaged := make(map[string]string)
installed := make(map[string]struct{})
for _, ps := range state {
Expand Down
6 changes: 5 additions & 1 deletion cli/download/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@ func (cmd *downloadCmd) Execute(ctx context.Context, flags *flag.FlagSet, _ ...i
return subcommands.ExitFailure
}

rm := downloader.AvailableVersions(ctx, repos, settings.CacheDir(), settings.CacheLife)
rm, err := downloader.AvailableVersions(ctx, repos, settings.CacheDir(), settings.CacheLife)
if err != nil {
logger.Errorf("Failed to download repos: %v", err)
return subcommands.ExitFailure
}
exitCode := subcommands.ExitSuccess

dir := cmd.downloadDir
Expand Down
5 changes: 4 additions & 1 deletion cli/install/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,10 @@ func (cmd *installCmd) Execute(ctx context.Context, flags *flag.FlagSet, _ ...an
logger.Error("No repos defined, create a .repo file or pass using the -sources flag.")
return subcommands.ExitFailure
}
i.repoMap = i.downloader.AvailableVersions(ctx, repos, i.cache, settings.CacheLife)
if i.repoMap, err = i.downloader.AvailableVersions(ctx, repos, i.cache, settings.CacheLife); err != nil {
logger.Errorf("Failed to download repos: %v", err)
return subcommands.ExitFailure
}
}

var errs error
Expand Down
6 changes: 5 additions & 1 deletion cli/latest/latest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,11 @@ func (cmd *latestCmd) Execute(ctx context.Context, flags *flag.FlagSet, _ ...int
return subcommands.ExitFailure
}

rm := downloader.AvailableVersions(ctx, repos, settings.CacheDir(), settings.CacheLife)
rm, err := downloader.AvailableVersions(ctx, repos, settings.CacheDir(), settings.CacheLife)
if err != nil {
logger.Errorf("Failed to download repos: %v", err)
return subcommands.ExitFailure
}
v, _, a, err := client.FindRepoLatest(pi, rm, settings.Archs)
if err != nil {
logger.Errorf("Failed to find package: %v", err)
Expand Down
6 changes: 5 additions & 1 deletion cli/update/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,11 @@ func (cmd *updateCmd) Execute(ctx context.Context, _ *flag.FlagSet, _ ...interfa
return subcommands.ExitFailure
}

rm := downloader.AvailableVersions(ctx, repos, cache, settings.CacheLife)
rm, err := downloader.AvailableVersions(ctx, repos, cache, settings.CacheLife)
if err != nil {
logger.Errorf("Failed to download repos: %v", err)
return subcommands.ExitFailure
}
ud := updates(state.PackageMap(), rm)
if ud == nil {
fmt.Println("No updates available for any installed packages.")
Expand Down
11 changes: 8 additions & 3 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"github.com/google/googet/v2/oswrap"
"github.com/google/googet/v2/priority"
"github.com/google/logger"
"go.uber.org/multierr"
"golang.org/x/oauth2/google"
"google.golang.org/api/googleapi"
)
Expand Down Expand Up @@ -150,20 +151,24 @@ func NewDownloader(proxyServer string) (*Downloader, error) {
}

// AvailableVersions builds a RepoMap from a list of sources.
func (d *Downloader) AvailableVersions(ctx context.Context, srcs map[string]priority.Value, cacheDir string, cacheLife time.Duration) RepoMap {
func (d *Downloader) AvailableVersions(ctx context.Context, srcs map[string]priority.Value, cacheDir string, cacheLife time.Duration) (RepoMap, error) {
rm := make(RepoMap)
var errs error = nil
for r, pri := range srcs {
rf, err := d.unmarshalRepoPackages(ctx, r, cacheDir, cacheLife)
if err != nil {
logger.Errorf("error reading repo %q: %v", r, err)
errs = multierr.Append(errs, fmt.Errorf("error reading repo %q: %w", r, err))
Copy link
Collaborator

@nguyen-phillip nguyen-phillip Jan 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use errors.Join from the standard library instead of multierr.

continue
}
rm[r] = Repo{
Priority: pri,
Packages: rf,
}
}
return rm
if errs != nil {
return nil, errs
}
return rm, nil
}

// unmarshalRepoPackages gets and unmarshals a repository URL or uses the cached contents
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ require (
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rivo/uniseg v0.2.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
golang.org/x/net v0.37.0 // indirect
golang.org/x/text v0.23.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
Expand Down
Loading