|
|
|
|
@ -201,8 +201,8 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
|
|
|
|
|
dir = new(vmwcommon.LocalOutputDir)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
localDir := localOutputDir{b.config.OutputDir}
|
|
|
|
|
log.Printf("b.config.OutputDir: %s, localDir: %s", b.config.OutputDir, localDir.dir)
|
|
|
|
|
exportOutputPath := b.config.OutputDir
|
|
|
|
|
|
|
|
|
|
if b.config.RemoteType != "" && b.config.Format != "" {
|
|
|
|
|
b.config.OutputDir = b.config.VMName
|
|
|
|
|
}
|
|
|
|
|
@ -214,8 +214,8 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
|
|
|
|
|
state.Put("config", &b.config)
|
|
|
|
|
state.Put("debug", b.config.PackerDebug)
|
|
|
|
|
state.Put("dir", dir)
|
|
|
|
|
state.Put("localDir", localDir)
|
|
|
|
|
state.Put("driver", driver)
|
|
|
|
|
state.Put("exportPath", exportOutputPath)
|
|
|
|
|
state.Put("hook", hook)
|
|
|
|
|
state.Put("ui", ui)
|
|
|
|
|
|
|
|
|
|
@ -334,7 +334,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
|
|
|
|
|
var files []string
|
|
|
|
|
if b.config.RemoteType != "" && b.config.Format != "" {
|
|
|
|
|
dir = new(vmwcommon.LocalOutputDir)
|
|
|
|
|
dir.SetOutputDir(localDir.dir)
|
|
|
|
|
dir.SetOutputDir(exportOutputPath)
|
|
|
|
|
files, err = dir.ListFiles()
|
|
|
|
|
} else {
|
|
|
|
|
files, err = state.Get("dir").(OutputDir).ListFiles()
|
|
|
|
|
|