Merge pull request #3239 from rickard-von-essen/issue-3238

Parallels: Support relative paths in output_directory
This commit is contained in:
Rickard von Essen 2016-02-24 12:12:54 +01:00
commit 13a0d3c675
1 changed files with 12 additions and 0 deletions

View File

@ -3,6 +3,7 @@ package common
import (
"fmt"
"os"
"path"
"github.com/mitchellh/packer/common"
"github.com/mitchellh/packer/template/interpolate"
@ -18,6 +19,17 @@ func (c *OutputConfig) Prepare(ctx *interpolate.Context, pc *common.PackerConfig
}
var errs []error
if path.IsAbs(c.OutputDir) {
c.OutputDir = path.Clean(c.OutputDir)
} else {
wd, err := os.Getwd()
if err != nil {
errs = append(errs, err)
}
c.OutputDir = path.Clean(path.Join(wd, c.OutputDir))
}
if !pc.PackerForce {
if _, err := os.Stat(c.OutputDir); err == nil {
errs = append(errs, fmt.Errorf(