Skip to content
This repository has been archived by the owner on Jan 20, 2023. It is now read-only.

Commit

Permalink
fixup: improve message on conflict
Browse files Browse the repository at this point in the history
Signed-off-by: Angel Misevski <amisevsk@redhat.com>
  • Loading branch information
amisevsk committed Feb 14, 2020
1 parent 391364a commit 28726d7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions brokers/metadata/broker.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ func (b *Broker) Start(pluginFQNs []model.PluginFQN, defaultRegistry string) err
b.PrintPlan(pluginMetas)

if collisions := utils.GetExtensionCollisions(pluginMetas); len(collisions) > 0 {
collisionLog := []string{"Warning: some plugins in this workspace have conflicting dependencies:"}
collisionLog := []string{"WARNING: multiple instances of the same extension will be included in this workspace:"}
collisionLog = append(collisionLog, utils.ConvertCollisionsToLog(collisions)...)
collisionLog = append(collisionLog, "If you encounter issues with plugins, please disable conflicting plugins above.")
collisionLog = append(collisionLog, "These plugins may not work as expected. If errors occur please try disabling all but one of the conflicting plugins.")
b.PrintInfoBuffer(collisionLog)
}

Expand Down
4 changes: 2 additions & 2 deletions utils/dependencies.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ func ConvertCollisionsToLog(collisions map[string][]string) []string {
output = append(output, fmt.Sprintf(" - %s", plugin))
}
if len(plugins) > 2 {
output = append(output, fmt.Sprintf(" all depend on the extension"))
output = append(output, fmt.Sprintf(" all depend on and embed extension"))
} else {
output = append(output, fmt.Sprintf(" both depend on extension"))
output = append(output, fmt.Sprintf(" both depend on and embed extension"))
}
output = append(output, fmt.Sprintf(" %s", ext))
}
Expand Down

0 comments on commit 28726d7

Please sign in to comment.