Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
Added flag to skip 3rd party package_index in UpdateIndex gRPC API
Fix #1788
  • Loading branch information
cmaglie committed Sep 6, 2022
commit 1da3b296ce4c62f990c1efeffddbd18df14275c9
3 changes: 2 additions & 1 deletion cli/instance/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ func FirstUpdate(instance *rpc.Instance) error {
if packageIndex.NotExist() {
_, err := commands.UpdateIndex(context.Background(),
&rpc.UpdateIndexRequest{
Instance: instance,
Instance: instance,
IgnoreCustomPackageIndexes: true,
},
output.ProgressBar(),
)
Expand Down
4 changes: 3 additions & 1 deletion commands/instances.go
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,9 @@ func UpdateIndex(ctx context.Context, req *rpc.UpdateIndexRequest, downloadCB rp
indexpath := configuration.DataDir(configuration.Settings)

urls := []string{globals.DefaultIndexURL}
urls = append(urls, configuration.Settings.GetStringSlice("board_manager.additional_urls")...)
if !req.GetIgnoreCustomPackageIndexes() {
urls = append(urls, configuration.Settings.GetStringSlice("board_manager.additional_urls")...)
}
for _, u := range urls {
logrus.Info("URL: ", u)
URL, err := utils.URLParse(u)
Expand Down
Loading