Merge pull request #1863 from stgraber/master

Fix most other compression algorithms
canonical · Apr 7, 2016 · 003b8a8 · 003b8a8
2 parents fc46491 + f244dce
commit 003b8a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -43,8 +43,6 @@ protobuf:
 .PHONY: check
 check: default
 	go get -v -x github.com/remyoudompheng/go-misc/deadcode
-	@# go vet can (and does on go < 1.5) fail
-	go get -v -x golang.org/x/tools/cmd/vet || true
 	go test -v ./...
 	cd test && ./main.sh
 

diff --git a/lxd/images.go b/lxd/images.go
@@ -124,7 +124,14 @@ func untarImage(imagefname string, destpath string) error {
 }
 
 func compressFile(path string, compress string) (string, error) {
-	cmd := exec.Command(compress, path, "-c", "-n")
+	reproducible := []string{"gzip"}
+
+	args := []string{path, "-c"}
+	if shared.StringInSlice(compress, reproducible) {
+		args = append(args, "-n")
+	}
+
+	cmd := exec.Command(compress, args...)
 
 	outfile, err := os.Create(path + ".compressed")
 	if err != nil {