Skip to content

Commit e023a70

Browse files
committed
compression: CompressStream: don't depend on Extension() method
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent e2abad6 commit e023a70

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

Diff for: compression/compression.go

+8-5
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func DecompressStream(archive io.Reader) (io.ReadCloser, error) {
168168
}, nil
169169

170170
default:
171-
return nil, fmt.Errorf("unsupported compression format: %s", (&compression).Extension())
171+
return nil, fmt.Errorf("unsupported compression format (%d)", compression)
172172
}
173173
}
174174

@@ -179,12 +179,15 @@ func CompressStream(dest io.Writer, compression Compression) (io.WriteCloser, er
179179
return nopWriteCloser{dest}, nil
180180
case Gzip:
181181
return gzip.NewWriter(dest), nil
182-
case Bzip2, Xz:
183-
// archive/bzip2 does not support writing, and there is no xz support at all
182+
case Bzip2:
183+
// archive/bzip2 does not support writing.
184+
return nil, errors.New("unsupported compression format: tar.bz2")
185+
case Xz:
186+
// there is no xz support at all
184187
// However, this is not a problem as docker only currently generates gzipped tars
185-
return nil, fmt.Errorf("unsupported compression format: %s", (&compression).Extension())
188+
return nil, errors.New("unsupported compression format: tar.xz")
186189
default:
187-
return nil, fmt.Errorf("unsupported compression format: %s", (&compression).Extension())
190+
return nil, fmt.Errorf("unsupported compression format (%d)", compression)
188191
}
189192
}
190193

0 commit comments

Comments
 (0)