Skip gzip compression if compression_level=0

This commit is contained in:
Ross Smith II 2013-11-18 10:38:19 -08:00
parent 66a256fd3f
commit 7d33d39da3
2 changed files with 17 additions and 6 deletions

View File

@ -11,6 +11,7 @@ FEATURES:
IMPROVEMENTS:
* Vagrant post-processor skips gzip compression when compression_level=0
* builder/amazon/all: Can now specify a list of multiple security group
IDs to apply. [GH-499]
* builder/amazon/all: AWS API requests are now retried when a temporary

View File

@ -2,6 +2,7 @@ package vagrant
import (
"archive/tar"
"compress/flate"
"compress/gzip"
"encoding/json"
"fmt"
@ -52,13 +53,22 @@ func DirToBox(dst, dir string, ui packer.Ui, level int) error {
}
defer dstF.Close()
gzipWriter, err := gzip.NewWriterLevel(dstF, level)
if err != nil {
return err
}
defer gzipWriter.Close()
var tarOrGzipWriter io.Writer
tarWriter := tar.NewWriter(gzipWriter)
if level != flate.NoCompression {
log.Printf("Compressing with gzip compression level %v", level)
gzipWriter, err := gzip.NewWriterLevel(dstF, level)
if err != nil {
return err
}
defer gzipWriter.Close()
tarOrGzipWriter = gzipWriter
} else {
log.Printf("Skipping gzip compression")
tarOrGzipWriter = dstF
}
tarWriter := tar.NewWriter(tarOrGzipWriter)
defer tarWriter.Close()
// This is the walk func that tars each of the files in the dir