diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-03-28 11:14:14 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-03-30 13:09:57 +0200 |
| commit | fcc19ea76016c8c3382dc6d70672ff0d7ec16cfe (patch) | |
| tree | bb6bef97e2506f49984531f8dcf0583a4fea066e | |
| parent | 660fee1622d2a5977f2d7bb82b4e111474f457c9 (diff) | |
| download | NetworkManager-fcc19ea76016c8c3382dc6d70672ff0d7ec16cfe.tar.gz | |
nmcli: output property values in "parsable" mode when the "--terse" option is specified (again)
Commit 623d888801f611be4e4d14570d6c2f84dcd92937 was reverted during
refactoring nmcli to simplify merge conflicts. Restore the behavior
of the patch.
| -rw-r--r-- | clients/cli/settings.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 5d1760adde..6cf35be6d4 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -4785,6 +4785,7 @@ setting_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean guint i; size_t tmpl_len; gs_free char *s_all = NULL; + NmcPropertyGetType type = NMC_PROPERTY_GET_PRETTY; g_return_val_if_fail (NM_IS_SETTING (setting), FALSE); @@ -4796,6 +4797,9 @@ setting_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean g_return_val_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (setting, setting_info->general->get_setting_gtype ()), FALSE); + if (nmc->print_output == NMC_PRINT_TERSE) + type = NMC_PROPERTY_GET_PARSABLE; + tmpl_len = sizeof (NmcOutputField) * (setting_info->properties_num + 1); tmpl = g_memdup (_get_nmc_output_fields (setting_info), tmpl_len); @@ -4812,7 +4816,7 @@ setting_details (NMSetting *setting, NmCli *nmc, const char *one_prop, gboolean set_val_str (arr, i, property_info->property_type->get_fcn (setting_info, property_info, setting, - NMC_PROPERTY_GET_PRETTY, + type, show_secrets)); } else set_val_str (arr, i, g_strdup (_(HIDDEN_TEXT))); |