Ticket #21849: 21849.diff

django/core/management/base.py

@@ -371 +371 @@
         all_issues = checks.run_checks(app_configs=app_configs, tags=tags)
 
         msg = ""
+        issue_count = 0
+
         if all_issues:
             debugs = [e for e in all_issues if e.level < checks.INFO and not e.is_silenced()]
             infos = [e for e in all_issues if checks.INFO <= e.level < checks.WARNING and not e.is_silenced()]
@@ -387 +389 @@
 
             for issues, group_name in sorted_issues:
                 if issues:
+                    issue_count += len(issues)
                     formatted = (
                         color_style().ERROR(force_str(e))
                         if e.is_serious()
@@ -394 +397 @@
                         for e in issues)
                     formatted = "\n".join(sorted(formatted))
                     msg += '\n%s:\n%s\n' % (group_name, formatted)
-
-            msg = "System check identified some issues:\n%s" % msg
+            if msg:
+                msg = "System check identified some issues:\n%s" % msg
 
         if display_num_errors:
             if msg:
                 msg += '\n'
             msg += "System check identified %s." % (
-                "no issues" if len(all_issues) == 0 else
-                "1 issue" if len(all_issues) == 1 else
-                "%s issues" % len(all_issues)
+                "no issues" if issue_count == 0 else
+                "1 issue" if issue_count == 1 else
+                "%s issues" % issue_count
             )
 
         if any(e.is_serious() and not e.is_silenced() for e in all_issues):
             raise CommandError(msg)
-        elif msg and all_issues:
+        elif msg and issue_count:
             self.stderr.write(msg)
         elif msg:
             self.stdout.write(msg)