fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 02:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: do not show description of unsupported properties

Browse source 
Properties without meta data cannot be set or displayed: do
not show them.
This commit is contained in:
Beniamino Galvani 2017-04-12 09:17:51 +02:00
parent 3509af90c9
commit c9c029181e
2 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clients/cli/connections.c
View file

@ -6446,8 +6446,10 @@ print_property_description (NMSetting *setting, const char *prop_name)
char *desc;
desc = nmc_setting_get_property_desc (setting, prop_name);
g_print ("\n=== [%s] ===\n%s\n", prop_name, desc);
g_free (desc);
if (desc) {
g_print ("\n=== [%s] ===\n%s\n", prop_name, desc);
g_free (desc);
}
}
static void

40
clients/cli/settings.c
View file

@ -738,32 +738,32 @@ nmc_setting_get_property_desc (NMSetting *setting, const char *prop)
const char *nmcli_desc_title = "";
const char *nmcli_nl = "";
const NMMetaPropertyInfo *property_info;
const char *desc = NULL;
g_return_val_if_fail (NM_IS_SETTING (setting), FALSE);
if ((property_info = nm_meta_property_info_find_by_setting (setting, prop))) {
const char *desc = NULL;
property_info = nm_meta_property_info_find_by_setting (setting, prop);
if (!property_info)
return NULL;
if (property_info->describe_doc) {
setting_desc = _(property_info->describe_doc);
setting_desc_title = _("[NM property description]");
}
if (property_info->is_name) {
/* Traditionally, the "name" property was not handled here.
* For the moment, skip it from get_property_val(). */
} else if (property_info->property_type->describe_fcn) {
desc = property_info->property_type->describe_fcn (property_info, &desc_to_free);
} else
desc = property_info->describe_message;
if (desc) {
nmcli_desc = _(desc);
nmcli_desc_title = _("[nmcli specific description]");
nmcli_nl = "\n";
}
if (property_info->describe_doc) {
setting_desc = _(property_info->describe_doc);
setting_desc_title = _("[NM property description]");
}
if (property_info->is_name) {
/* Traditionally, the "name" property was not handled here.
* For the moment, skip it from get_property_val(). */
} else if (property_info->property_type->describe_fcn) {
desc = property_info->property_type->describe_fcn (property_info, &desc_to_free);
} else
desc = property_info->describe_message;
if (desc) {
nmcli_desc = _(desc);
nmcli_desc_title = _("[nmcli specific description]");
nmcli_nl = "\n";
}
return g_strdup_printf ("%s\n%s\n%s%s%s%s",
setting_desc_title,