particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools: support zstd in image-info

Browse source 
We have images that are zstd-compresed now so `image-info` needs to be
able to deal with them.

Signed-off-by: Simon de Vlieger <supakeen@redhat.com>
This commit is contained in:
Simon de Vlieger 2025-03-07 12:06:57 +01:00 • committed by Achilleas Koutsou
parent 9b72d9ee50
commit 563153ac6f
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tools/osbuild-image-info
View file

@ -2888,12 +2888,15 @@ def analyse_tarball(path):
def is_compressed(path):
_, encoding = mimetypes.guess_type(path)
return encoding in ["xz", "gzip", "bzip2"]
mtype, encoding = mimetypes.guess_type(path)
# zst files do not return an "encoding", only a mimetype so they need to be
# special cased
return encoding in ["xz", "gzip", "bzip2"] or mtype == "application/zstd"
def analyse_compressed(path):
_, encoding = mimetypes.guess_type(path)
mtype, encoding = mimetypes.guess_type(path)
if encoding == "xz":
command = ["unxz", "--force"]
@ -2901,6 +2904,10 @@ def analyse_compressed(path):
command = ["gunzip", "--force"]
elif encoding == "bzip2":
command = ["bunzip2", "--force"]
elif mtype == "application/zstd":
# zst files do not return an "encoding", only a mimetype so they need to be
# special cased
command = ["unzstd", "--force", "--rm"]
else:
raise ValueError(f"Unsupported compression: {encoding}")