adjust var declaration scope

pull/6942/head
Matthew Patton 7 years ago
parent 20f68228b6
commit 0a72297da8

@ -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)
}

Loading…
Cancel
Save