From: Anita Zhang <the.anitazha@gmail.com>
Date: Tue, 23 Jul 2019 20:26:51 +0000 (-0700)
Subject: [systemctl] Don't print ExecXYZEx= when doing 'systemctl status'
X-Git-Tag: v243-rc1~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e5c8524447cc7309c703b5eb803a48e30b4cf050;p=thirdparty%2Fsystemd.git

[systemctl] Don't print ExecXYZEx= when doing 'systemctl status'

The info printed in this function is the same as the non-Ex version of the
property so there's no point double printing.

Other places that print ExecXYZEx= properties are left alone since the
displayed information is different.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 97f3176cc55..95a85245946 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4358,6 +4358,11 @@ static void print_status_info(
                 if (p->code == 0)
                         continue;
 
+                /* Don't print ExecXYZEx= properties here since it will appear as a
+                 * duplicate of the non-Ex= variant. */
+                if (endswith(p->name, "Ex"))
+                        continue;
+
                 argv = strv_join(p->argv, " ");
                 printf("  Process: "PID_FMT" %s=%s ", p->pid, p->name, strna(argv));