@@ -59,24 +59,19 @@ func InitIndexes() (*packagemanager.PackageManager, *firmwareindex.Index) {
59
59
}
60
60
61
61
// Load main firmware index and optional additional indexes
62
- firmwareIndex , err := indexes .GetFirmwareIndex (globals .ModuleFirmwareIndexGZURL , true )
62
+ pluginFirmwareIndex , err := indexes .GetFirmwareIndex (globals .PluginFirmwareIndexGZURL , true )
63
63
if err != nil {
64
- feedback .Fatal (fmt .Sprintf ("Can't load firmware index: %s" , err ), feedback .ErrGeneric )
65
- }
66
- if pluginIndex , err := indexes .GetFirmwareIndex (globals .PluginFirmwareIndexGZURL , true ); err != nil {
67
64
feedback .Fatal (fmt .Sprintf ("Can't load (plugin) firmware index: %s" , err ), feedback .ErrGeneric )
68
- } else {
69
- firmwareIndex .MergeWith (pluginIndex )
70
65
}
71
66
for _ , additionalURL := range AdditionalFirmwareIndexURLs {
72
67
additionalIndex , err := indexes .GetFirmwareIndex (additionalURL , false )
73
68
if err != nil {
74
69
feedback .Fatal (fmt .Sprintf ("Can't load firmware index: %s" , err ), feedback .ErrGeneric )
75
70
}
76
- firmwareIndex .MergeWith (additionalIndex )
71
+ pluginFirmwareIndex .MergeWith (additionalIndex )
77
72
}
78
73
79
- return pmbuilder .Build (), firmwareIndex
74
+ return pmbuilder .Build (), pluginFirmwareIndex
80
75
}
81
76
82
77
// CheckFlags runs a basic check, errors if the flags are not defined
0 commit comments