libnm-core/libnm-util: fix an erroneous error message
authorJiří Klimeš <jklimes@redhat.com>
Fri, 25 Sep 2015 14:11:24 +0000 (16:11 +0200)
committerJiří Klimeš <jklimes@redhat.com>
Fri, 25 Sep 2015 14:11:24 +0000 (16:11 +0200)
ipv6.dns: 'this property is not allowed for '%s=%s'' not allowed for method=ignore

libnm-core/nm-setting-ip6-config.c
libnm-util/nm-setting-ip6-config.c

index bb4b4c3..9884b86 100644 (file)
@@ -129,7 +129,6 @@ verify (NMSetting *setting, NMConnection *connection, GError **error)
                        g_set_error (error,
                                     NM_CONNECTION_ERROR,
                                     NM_CONNECTION_ERROR_INVALID_PROPERTY,
-                                    _("'%s' not allowed for %s=%s"),
                                     _("this property is not allowed for '%s=%s'"),
                                     NM_SETTING_IP_CONFIG_METHOD, method);
                        g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP_CONFIG_DNS);
index 49bd3cc..2ddce6c 100644 (file)
@@ -853,7 +853,6 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
                        g_set_error (error,
                                     NM_SETTING_IP6_CONFIG_ERROR,
                                     NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD,
-                                    _("'%s' not allowed for %s=%s"),
                                     _("this property is not allowed for '%s=%s'"),
                                     NM_SETTING_IP6_CONFIG_METHOD, priv->method);
                        g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_DNS);