upstream/packer
1
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-05-28 04:35:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

adjust var declaration scope

Browse source
This commit is contained in:
Matthew Patton 2018-10-31 01:06:00 -04:00
parent 20f68228b6
commit 0a72297da8
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packer/config_file.go
View file

@ -22,15 +22,16 @@ func ConfigDir() (string, error) {
// ConfigTmpDir returns the configuration tmp directory for Packer
func ConfigTmpDir() (string, error) {
var tmpdir, td, cd string
var err error
cd, err := ConfigDir()
for _, tmpdir := range []string{os.Getenv("PACKER_TMP_DIR"), os.TempDir(), cd} {
cd, _ = ConfigDir()
for _, tmpdir = range []string{os.Getenv("PACKER_TMP_DIR"), os.TempDir(), cd} {
if tmpdir != "" {
break
}
}
if td, err := ioutil.TempDir(tmpdir, "packer"); err != nil {
if td, err = ioutil.TempDir(tmpdir, "packer"); err != nil {
log.Fatal(err)
}