diff options
author | Ashley Cui <acui@redhat.com> | 2021-05-12 14:35:49 -0400 |
---|---|---|
committer | Ashley Cui <acui@redhat.com> | 2021-05-12 14:35:49 -0400 |
commit | 01f6e4b53e08e7e6571c4b209c31b6d5b2082aef (patch) | |
tree | 38f07f76bf428fac13f4fcbd13e11fe254aaa598 | |
parent | 0ce6a65b3961465593470c3457d75b0a846c8d98 (diff) | |
download | podman-01f6e4b53e08e7e6571c4b209c31b6d5b2082aef.tar.gz podman-01f6e4b53e08e7e6571c4b209c31b6d5b2082aef.tar.bz2 podman-01f6e4b53e08e7e6571c4b209c31b6d5b2082aef.zip |
Print "extracting" only on compressed file
We should only print "extracting compressed file" when the file is
actually compressed
Signed-off-by: Ashley Cui <acui@redhat.com>
-rw-r--r-- | pkg/machine/pull.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkg/machine/pull.go b/pkg/machine/pull.go index d9f34057f..68bb551dc 100644 --- a/pkg/machine/pull.go +++ b/pkg/machine/pull.go @@ -162,7 +162,11 @@ func Decompress(localPath, uncompressedPath string) error { return err } - if compressionType := archive.DetectCompression(sourceFile); compressionType.Extension() == "tar.xz" { + compressionType := archive.DetectCompression(sourceFile) + if compressionType != archive.Uncompressed { + fmt.Println("Extracting compressed file") + } + if compressionType == archive.Xz { return decompressXZ(localPath, uncompressedFileWriter) } return decompressEverythingElse(localPath, uncompressedFileWriter) @@ -172,7 +176,6 @@ func Decompress(localPath, uncompressedPath string) error { // Maybe extracting then renameing is a good idea here.. // depends on xz: not pre-installed on mac, so it becomes a brew dependency func decompressXZ(src string, output io.Writer) error { - fmt.Println("Extracting compressed file") cmd := exec.Command("xzcat", "-k", src) //cmd := exec.Command("xz", "-d", "-k", "-v", src) stdOut, err := cmd.StdoutPipe() @@ -190,7 +193,6 @@ func decompressXZ(src string, output io.Writer) error { } func decompressEverythingElse(src string, output io.Writer) error { - fmt.Println("Extracting compressed file") f, err := os.Open(src) if err != nil { return err |