From 061e74b6239bfb8540beacb305682189f7fa4952 Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Sun, 28 Jul 2024 13:43:04 -0400
Subject: [PATCH] Add disabled code to log failed commands to stderr

---
 management/utils.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/management/utils.py b/management/utils.py
index fbc4483a..0dad6963 100644
--- a/management/utils.py
+++ b/management/utils.py
@@ -122,15 +122,18 @@ def shell(method, cmd_args, env=None, capture_stderr=False, return_bytes=False,
     if method == "check_output" and input is not None:
         kwargs['input'] = input
 
-    if not trap:
+    try:
         ret = getattr(subprocess, method)(cmd_args, **kwargs)
-    else:
-        try:
-            ret = getattr(subprocess, method)(cmd_args, **kwargs)
-            code = 0
-        except subprocess.CalledProcessError as e:
-            ret = e.output
-            code = e.returncode
+        code = 0
+    except subprocess.CalledProcessError as e:
+        if not trap:
+            if False:
+                import sys, shlex
+                print(shlex.join(cmd_args), file=sys.stderr)
+                raise
+            raise
+        ret = e.output
+        code = e.returncode
     if not return_bytes and isinstance(ret, bytes): ret = ret.decode("utf8")
     if not trap:
         return ret