From 228a2446d1a2e2152330372bdf545d5874e90ccb Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Wed, 13 Jun 2018 10:18:32 +0200
Subject: [PATCH] genorig.py: Provide xz parameters to tar itself

---
 debian/bin/genorig.py | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/debian/bin/genorig.py b/debian/bin/genorig.py
index a377d6833..a35a9236f 100755
--- a/debian/bin/genorig.py
+++ b/debian/bin/genorig.py
@@ -141,12 +141,25 @@ class Main(object):
         except OSError:
             pass
         self.log("Generate tarball %s\n" % out)
-        cmdline = '''LC_ALL=C XZ_OPT=-T0
-                     tar -C '%s' --sort name --mtime '%s' --owner root --group root -caf '%s' '%s'
-                  ''' % (self.dir, orig_date, out, self.orig)
+
+        env = os.environ.copy()
+        env.update({
+            'LC_ALL': 'C',
+        })
+        cmd = [
+            'tar',
+            '-C', self.dir,
+            '--sort=name',
+            '--mtime={}'.format(orig_date),
+            '--owner=root',
+            '--group=root',
+            '--use-compress-program=xz -T0',
+            '-cf',
+            out, self.orig,
+        ]
+
         try:
-            if os.spawnv(os.P_WAIT, '/bin/sh', ['sh', '-c', cmdline]):
-                raise RuntimeError("Can't patch source")
+            subprocess.run(cmd, env=env, check=True)
             os.chmod(out, 0o644)
         except:
             try: