opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-28 01:04:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10324 from containers/uncompressing

Browse Source 
[NO TESTS NEEDED] Print "extracting" only on compressed file
This commit is contained in:
OpenShift Merge Robot
2021-05-12 16:10:48 -04:00
committed by GitHub
parent d6507fcfbc 01f6e4b53e
commit 071799f259
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/machine/pull.go
View File

@ -162,7 +162,11 @@ func Decompress(localPath, uncompressedPath string) error {
return err 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 decompressXZ(localPath, uncompressedFileWriter)
} }
return decompressEverythingElse(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.. // Maybe extracting then renameing is a good idea here..
// depends on xz: not pre-installed on mac, so it becomes a brew dependency // depends on xz: not pre-installed on mac, so it becomes a brew dependency
func decompressXZ(src string, output io.Writer) error { func decompressXZ(src string, output io.Writer) error {
fmt.Println("Extracting compressed file")
cmd := exec.Command("xzcat", "-k", src) cmd := exec.Command("xzcat", "-k", src)
//cmd := exec.Command("xz", "-d", "-k", "-v", src) //cmd := exec.Command("xz", "-d", "-k", "-v", src)
stdOut, err := cmd.StdoutPipe() stdOut, err := cmd.StdoutPipe()
@ -190,7 +193,6 @@ func decompressXZ(src string, output io.Writer) error {
} }
func decompressEverythingElse(src string, output io.Writer) error { func decompressEverythingElse(src string, output io.Writer) error {
fmt.Println("Extracting compressed file")
f, err := os.Open(src) f, err := os.Open(src)
if err != nil { if err != nil {
return err return err