From 0847ede1e31039cc04f43bfa1bced6741a9fd3c3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 3 Jul 2020 11:34:12 +0200 Subject: [PATCH] cli: suppress "(unknown)" output in terse mode for device properties HWADDR and DRIVER $ nmcli -f GENERAL.HWADDR device show ovsport0 GENERAL.HWADDR: (unknown) but: $ nmcli -f GENERAL.HWADDR --terse device show ovsport0 GENERAL.HWADDR: This is an API change of nmcli. (cherry picked from commit 2a1e621704f8339de1ea3fe8af6f05221028ce6b) --- clients/cli/devices.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 27f72e7787..f5b79c8381 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -168,14 +168,14 @@ _metagen_device_detail_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) return nm_device_get_product (d); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DRIVER: s = nm_device_get_driver (d); - return s ?: nmc_meta_generic_get_str_i18n (N_("(unknown)"), get_type); + return s ?: nmc_meta_generic_get_unknown (get_type); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_DRIVER_VERSION: return nm_device_get_driver_version (d); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_FIRMWARE_VERSION: return nm_device_get_firmware_version (d); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_HWADDR: s = nm_device_get_hw_address (d); - return s ?: nmc_meta_generic_get_str_i18n (N_("(unknown)"), get_type); + return s ?: nmc_meta_generic_get_unknown (get_type); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_MTU: return (*out_to_free = g_strdup_printf ("%u", (guint) nm_device_get_mtu (d))); case NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_STATE: