From 02b8f1135e0536f87fbc1a68a00fb8201dc5fced Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 20 Nov 2020 12:05:42 +0100
Subject: [PATCH] Replace os.system with subprocess.run so that it's easier to
 report errors correctly on Windows.

---
 cdist | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/cdist b/cdist
index 6011338..c9f15a0 100755
--- a/cdist
+++ b/cdist
@@ -256,9 +256,12 @@ def rmtree(a):
 
 def command(c):
     log_normal(c)
-    r = os.system(c)
-    if (r >> 8):
-        raise Error('command %s failed' % c)
+    try:
+        r = subprocess.run(shlex.split(c))
+        if r.returncode != 0:
+            raise Error(f'command {c} failed ({r.returncode})')
+    except Exception as e:
+        raise Error(f'command {c} failed ({e})')
 
 def command_and_read(c):
     log_normal(c)
-- 
2.30.2