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

Don't export errors

Browse Source
This commit is contained in:
Chris Bednarski 2015-08-19 13:12:16 -07:00
parent 746b9a8391
commit 5503b7f496
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/docker/builder.go
View File

@ -65,7 +65,7 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
log.Printf("[DEBUG] Container will be exported to %s", b.config.ExportPath) log.Printf("[DEBUG] Container will be exported to %s", b.config.ExportPath)
steps = append(steps, new(StepExport)) steps = append(steps, new(StepExport))
} else { } else {
return nil, ErrArtifactNotUsed return nil, errArtifactNotUsed
} }
// Setup the state bag and initial state for the steps // Setup the state bag and initial state for the steps

16
builder/docker/config.go
View File

@ -13,10 +13,10 @@ import (
) )
var ( var (
ErrArtifactNotUsed = fmt.Errorf("No instructions given for handling the artifact; expected commit, discard, or export_path") errArtifactNotUsed = fmt.Errorf("No instructions given for handling the artifact; expected commit, discard, or export_path")
ErrArtifactUseConflict = fmt.Errorf("Cannot specify more than one of commit, discard, and export_path") errArtifactUseConflict = fmt.Errorf("Cannot specify more than one of commit, discard, and export_path")
ErrExportPathNotFile = fmt.Errorf("export_path must be a file, not a directory") errExportPathNotFile = fmt.Errorf("export_path must be a file, not a directory")
ErrImageNotSpecified = fmt.Errorf("Image must be specified") errImageNotSpecified = fmt.Errorf("Image must be specified")
) )
type Config struct { type Config struct {
@ -89,20 +89,20 @@ func NewConfig(raws ...interface{}) (*Config, []string, error) {
errs = packer.MultiErrorAppend(errs, es...) errs = packer.MultiErrorAppend(errs, es...)
} }
if c.Image == "" { if c.Image == "" {
errs = packer.MultiErrorAppend(errs, ErrImageNotSpecified) errs = packer.MultiErrorAppend(errs, errImageNotSpecified)
} }
if (c.ExportPath != "" && c.Commit) || (c.ExportPath != "" && c.Discard) || (c.Commit && c.Discard) { if (c.ExportPath != "" && c.Commit) || (c.ExportPath != "" && c.Discard) || (c.Commit && c.Discard) {
errs = packer.MultiErrorAppend(errs, ErrArtifactUseConflict) errs = packer.MultiErrorAppend(errs, errArtifactUseConflict)
} }
if c.ExportPath == "" && !c.Commit && !c.Discard { if c.ExportPath == "" && !c.Commit && !c.Discard {
errs = packer.MultiErrorAppend(errs, ErrArtifactNotUsed) errs = packer.MultiErrorAppend(errs, errArtifactNotUsed)
} }
if c.ExportPath != "" { if c.ExportPath != "" {
if fi, err := os.Stat(c.ExportPath); err == nil && fi.IsDir() { if fi, err := os.Stat(c.ExportPath); err == nil && fi.IsDir() {
errs = packer.MultiErrorAppend(errs, ErrExportPathNotFile) errs = packer.MultiErrorAppend(errs, errExportPathNotFile)
} }
} }