scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-31 18:48:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delegate usage to the UI

Browse Source
This commit is contained in:
Seth Vargo
2017-08-30 12:48:39 -04:00
parent 30dc835b2c
commit eb4ab6840d
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
command/base.go
View File

@@ -313,17 +313,10 @@ type FlagSets struct {
// NewFlagSets creates a new flag sets. // NewFlagSets creates a new flag sets.
func NewFlagSets(ui cli.Ui) *FlagSets { func NewFlagSets(ui cli.Ui) *FlagSets {
mainSet := flag.NewFlagSet("", flag.ContinueOnError) mainSet := flag.NewFlagSet("", flag.ContinueOnError)
mainSet.Usage = func() {}
// Pull errors from the flagset into the ui's error // Errors and usage are controlled by the CLI.
errR, errW := io.Pipe() mainSet.Usage = func() {}
errScanner := bufio.NewScanner(errR) mainSet.SetOutput(ioutil.Discard)
go func() {
for errScanner.Scan() {
ui.Error(errScanner.Text())
}
}()
mainSet.SetOutput(errW)
return &FlagSets{ return &FlagSets{
flagSets: make([]*FlagSet, 0, 6), flagSets: make([]*FlagSet, 0, 6),