From 6cad911674dc067ffab44eea4f5c8170fa0a89b1 Mon Sep 17 00:00:00 2001
From: Adam Johnson <me@adamj.eu>
Date: Tue, 14 Apr 2020 08:55:45 +0100
Subject: [PATCH] Refs #29501 -- Simplified BaseCommand.run_from_argv() a bit.

---
 django/core/management/base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/django/core/management/base.py b/django/core/management/base.py
index 74ffc94dcf..82da46875a 100644
--- a/django/core/management/base.py
+++ b/django/core/management/base.py
@@ -326,8 +326,8 @@ class BaseCommand:
         handle_default_options(options)
         try:
             self.execute(*args, **cmd_options)
-        except Exception as e:
-            if options.traceback or not isinstance(e, CommandError):
+        except CommandError as e:
+            if options.traceback:
                 raise
 
             # SystemCheckError takes care of its own formatting.