diff options
author | Thomas Haller <thaller@redhat.com> | 2017-06-09 15:35:04 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2017-06-09 15:37:59 +0200 |
commit | 31aa178920e1d1437f86f1f0d5798298f44d4654 (patch) | |
tree | 8cb808871de308f0a4cc1e7cb14bcb87441a30df | |
parent | 6a4774b1a8fdc346e0a2d2a3d2ec43054190fdc5 (diff) | |
parent | c9c0a138294819d1c987d420918fa10d18e9a353 (diff) |
cli: fix output of iface in overview output (rh#1460219)
https://bugzilla.redhat.com/show_bug.cgi?id=1460219
(cherry picked from commit 58c8140acb0b89bf6e9fecc70c2ae86b266f2eff)
-rw-r--r-- | clients/cli/general.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clients/cli/general.c b/clients/cli/general.c index 12e76efd62..68fab6e049 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -1136,10 +1136,10 @@ device_overview (NmCli *nmc, NMDevice *device) else g_string_append_printf (outbuf, "%s, ", _("hw")); - if ( nm_device_get_ip_iface (device) - && g_strcmp0 (nm_device_get_ip_iface (device), nm_device_get_iface (device)) - && g_strcmp0 (nm_device_get_ip_iface (device), "")) - g_string_append_printf (outbuf, "%s %s,", _("iface"), nm_device_get_ip_iface (device)); + if (!NM_IN_STRSET (nm_device_get_ip_iface (device), + NULL, + nm_device_get_iface (device))) + g_string_append_printf (outbuf, "%s %s, ", _("iface"), nm_device_get_ip_iface (device)); if (nm_device_get_physical_port_id (device)) g_string_append_printf (outbuf, "%s %s, ", _("port"), nm_device_get_physical_port_id (device)); |