iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2226 from mitchellh/b-config-file 

config file doesn't need to exist if set [GH-2225]
This commit is contained in:
Mitchell Hashimoto 2015-06-15 09:36:06 -07:00
parent a95408aa21 511013dbe4
commit e80b1c3159
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.go
View File

@ -217,12 +217,10 @@ func loadConfig() (*config, error) {
return nil, err return nil, err
} }
mustExist := true
configFilePath := os.Getenv("PACKER_CONFIG") configFilePath := os.Getenv("PACKER_CONFIG")
if configFilePath == "" { if configFilePath == "" {
var err error var err error
configFilePath, err = configFile() configFilePath, err = configFile()
mustExist = false
if err != nil { if err != nil {
log.Printf("Error detecting default config file path: %s", err) log.Printf("Error detecting default config file path: %s", err)
@ -240,11 +238,7 @@ func loadConfig() (*config, error) {
return nil, err return nil, err
} }
if mustExist { log.Printf("[WARN] Config file doesn't exist: %s", configFilePath)
return nil, err
}
log.Println("File doesn't exist, but doesn't need to. Ignoring.")
return &config, nil return &config, nil
} }
defer f.Close() defer f.Close()