diff --git a/osc/build.py b/osc/build.py index 46bd61f0..13093936 100644 --- a/osc/build.py +++ b/osc/build.py @@ -424,7 +424,7 @@ def get_prefer_pkgs(dirs, wanted_arch, type, cpio): if type == 'dsc' or type == 'collax' or type == 'livebuild': suffix = '*.deb' elif type == 'arch': - suffix = '*.pkg.tar.xz' + suffix = '*.pkg.tar.*' for dir in dirs: # check for repodata diff --git a/osc/fetch.py b/osc/fetch.py index 6aefb061..a0a8e8d9 100644 --- a/osc/fetch.py +++ b/osc/fetch.py @@ -82,9 +82,9 @@ class Fetcher: raise oscerr.APIError('CPIO archive is incomplete ' '(see .errors file)') if package == '_repository': - n = re.sub(b'\.pkg\.tar\..z$', b'.arch', hdr.filename) + n = re.sub(b'\.pkg\.tar\.(zst|.z)$', b'.arch', hdr.filename) if n.startswith(b'container:'): - n = re.sub(b'\.tar\..z$', b'.tar', hdr.filename) + n = re.sub(b'\.tar\.(zst|.z)$', b'.tar', hdr.filename) pac = pkgs[decode_it(n.rsplit(b'.', 1)[0])] pac.canonname = hdr.filename else: diff --git a/osc/util/packagequery.py b/osc/util/packagequery.py index ac2c74c3..0fc46f28 100644 --- a/osc/util/packagequery.py +++ b/osc/util/packagequery.py @@ -72,7 +72,8 @@ class PackageQuery: elif magic[:5] == b'