luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #2599 from hashicorp/data-dir-handling 

Don't error if data-dir doesn't exist
This commit is contained in:
James Phillips 2016-12-15 09:58:40 -08:00 committed by GitHub
parent f93567ac78 5d03ab53f3
commit ef1039bd21
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command/agent/command.go
View File

@ -213,8 +213,10 @@ func (c *Command) readConfig() *Config {
} }
if finfo, err := os.Stat(config.DataDir); err != nil { if finfo, err := os.Stat(config.DataDir); err != nil {
c.Ui.Error(fmt.Sprintf("Error getting data-dir: %s", err)) if !os.IsNotExist(err) {
return nil c.Ui.Error(fmt.Sprintf("Error getting data-dir: %s", err))
return nil
}
} else if !finfo.IsDir() { } else if !finfo.IsDir() {
c.Ui.Error(fmt.Sprintf("The data-dir specified at %q is not a directory", config.DataDir)) c.Ui.Error(fmt.Sprintf("The data-dir specified at %q is not a directory", config.DataDir))
return nil return nil