Merge pull request #5235 from hashicorp/revert-5101-4992_push_vars

Revert "make sure that flagVars is not a nil map"
This commit is contained in:
Matthew Hooker 2017-08-11 11:13:09 -07:00 committed by GitHub
commit 59c9b3729c
1 changed files with 0 additions and 3 deletions

View File

@ -120,9 +120,6 @@ func (m *Meta) FlagSet(n string, fs FlagSetFlags) *flag.FlagSet {
f.Var((*kvflag.Flag)(&m.flagVars), "var", "")
f.Var((*kvflag.FlagJSON)(&m.flagVars), "var-file", "")
}
if len(m.flagVars) == 0 {
m.flagVars = make(map[string]string)
}
// Create an io.Writer that writes to our Ui properly for errors.
// This is kind of a hack, but it does the job. Basically: create