diff options
author | Julian Andres Klode <jak@debian.org> | 2018-04-15 18:57:53 +0000 |
---|---|---|
committer | Julian Andres Klode <jak@debian.org> | 2018-04-15 18:57:53 +0000 |
commit | 1cbb4c95f3fdd0872a7f1cb0f970f50a68c13959 (patch) | |
tree | a4d862020a09309efa6801d791216649368bd263 /apt-inst | |
parent | e441cba86f9aa50c9e785d9aa45ae0a43ac5c123 (diff) | |
parent | 7cf73b7a1e4f127098cae5b8593cd1d0c675e4a4 (diff) |
Merge branch 'pu/zstd' into 'master'
pu/zstd
See merge request apt-team/apt!8
Diffstat (limited to 'apt-inst')
-rw-r--r-- | apt-inst/deb/debfile.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc index 8eef446bb..6f7cf5691 100644 --- a/apt-inst/deb/debfile.cc +++ b/apt-inst/deb/debfile.cc @@ -50,7 +50,9 @@ debDebFile::debDebFile(FileFd &File) : File(File), AR(File) if (!CheckMember("control.tar") && !CheckMember("control.tar.gz") && - !CheckMember("control.tar.xz")) { + !CheckMember("control.tar.xz") && + !CheckMember("control.tar.zst")) + { _error->Error(_("This is not a valid DEB archive, missing '%s' member"), "control.tar"); return; } @@ -59,7 +61,9 @@ debDebFile::debDebFile(FileFd &File) : File(File), AR(File) !CheckMember("data.tar.gz") && !CheckMember("data.tar.bz2") && !CheckMember("data.tar.lzma") && - !CheckMember("data.tar.xz")) { + !CheckMember("data.tar.xz") && + !CheckMember("data.tar.zst")) + { _error->Error(_("This is not a valid DEB archive, missing '%s' member"), "data.tar"); return; } |