From c71bd9df82531e00940602ac91c78675336fecbe Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 30 Apr 2016 12:56:25 +0200 Subject: [PATCH] device: improve error message for failure to reapply --- src/devices/nm-device.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 6894cbb49c..ad6f835f40 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -7334,13 +7334,20 @@ _hash_check_invalid_keys_impl (GHashTable *hash, const char *setting_name, GErro break; } } - g_set_error (error, - NM_DEVICE_ERROR, - NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION, - "Can't reapply changes to '%s%s%s' setting", - setting_name ? : "", - setting_name ? "." : "", - first_invalid_key ? : ""); + if (setting_name) { + g_set_error (error, + NM_DEVICE_ERROR, + NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION, + "Can't reapply changes to '%s.%s' setting", + setting_name, + first_invalid_key); + } else { + g_set_error (error, + NM_DEVICE_ERROR, + NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION, + "Can't reapply any changes to '%s' setting", + first_invalid_key); + } g_return_val_if_fail (first_invalid_key, FALSE); return FALSE; }