From 5f2721d8f65001db419c88d52c23dcbbbb6f722c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Thu, 9 Jan 2020 15:01:25 +0100
Subject: [PATCH] - support zstd arch linux files in local build

Note: This requires a tar executable supporting zstd
---
 osc/build.py             | 2 +-
 osc/fetch.py             | 4 ++--
 osc/util/packagequery.py | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osc/build.py b/osc/build.py
index 8f4802ee..b86490d6 100644
--- a/osc/build.py
+++ b/osc/build.py
@@ -430,7 +430,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 d84474ee..4f598af6 100644
--- a/osc/fetch.py
+++ b/osc/fetch.py
@@ -78,9 +78,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'<?xml':
             f.close()
             return None
-        elif magic[:5] == b'\375\067zXZ' or magic[:2] == b'\037\213':
+        # arch tar ball compressed with gz, xz or zst
+        elif magic[:5] == b'\375\067zXZ' or magic[:2] == b'\037\213' or magic[:5] == b'(\xb5/\xfd\x2f':
             from . import archquery
             pkgquery = archquery.ArchQuery(f)
         else: