colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-util: more specific error for missing ipv[46].adddress when method=manual

Browse Source
This commit is contained in:
Jiří Klimeš
2014-03-03 11:43:06 +01:00
parent 90ff0786cc
commit d98a34dcda
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libnm-util/nm-setting-ip4-config.c
View File

@@ -839,10 +839,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
if (!strcmp (priv->method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) { if (!strcmp (priv->method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) {
if (!priv->addresses) { if (!priv->addresses) {
g_set_error_literal (error, g_set_error (error,
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY,
_("property is missing")); _("this property cannot be empty for '%s=%s'"),
NM_SETTING_IP4_CONFIG_METHOD, priv->method);
g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES); g_prefix_error (error, "%s.%s: ", NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_SETTING_IP4_CONFIG_ADDRESSES);
return FALSE; return FALSE;
} }

9
libnm-util/nm-setting-ip6-config.c
View File

@@ -820,10 +820,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
if (!strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) { if (!strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
if (!priv->addresses) { if (!priv->addresses) {
g_set_error_literal (error, g_set_error (error,
NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR,
NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY, NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY,
_("property is missing")); _("this property cannot be empty 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_ADDRESSES); g_prefix_error (error, "%s.%s: ", NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_SETTING_IP6_CONFIG_ADDRESSES);
return FALSE; return FALSE;
} }