Commit cfcc4752 authored by Ryan Schneider's avatar Ryan Schneider Committed by Péter Szilágyi

cmd/utils: fix bug when checking for flag value conflicts (#17803)

parent c5d34fc9
...@@ -1085,11 +1085,14 @@ func checkExclusive(ctx *cli.Context, args ...interface{}) { ...@@ -1085,11 +1085,14 @@ func checkExclusive(ctx *cli.Context, args ...interface{}) {
if i+1 < len(args) { if i+1 < len(args) {
switch option := args[i+1].(type) { switch option := args[i+1].(type) {
case string: case string:
// Extended flag, expand the name and shift the arguments // Extended flag check, make sure value set doesn't conflict with passed in option
if ctx.GlobalString(flag.GetName()) == option { if ctx.GlobalString(flag.GetName()) == option {
name += "=" + option name += "=" + option
set = append(set, "--"+name)
} }
// shift arguments and continue
i++ i++
continue
case cli.Flag: case cli.Flag:
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment