summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2015-09-25 16:11:24 +0200
committerJiří Klimeš <jklimes@redhat.com>2015-09-25 16:11:24 +0200
commit12e6cf1f2053f92dee227fc2ce9ea625fed9917e (patch)
tree8968d0c837c9721c85e80b2dd42616a51c72fd37
parentecf084935590a86558e1cafe66f3faebbf2c5925 (diff)
downloadNetworkManager-12e6cf1f2053f92dee227fc2ce9ea625fed9917e.tar.gz
libnm-core/libnm-util: fix an erroneous error message
ipv6.dns: 'this property is not allowed for '%s=%s'' not allowed for method=ignore
-rw-r--r--libnm-core/nm-setting-ip6-config.c1
-rw-r--r--libnm-util/nm-setting-ip6-config.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c
index bb4b4c3a16..9884b86c9c 100644
--- a/libnm-core/nm-setting-ip6-config.c
+++ b/libnm-core/nm-setting-ip6-config.c
@@ -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);
diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index 49bd3cc6df..2ddce6c19a 100644
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -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);