nmcli: don't substitute empty strings with "--" in terse mode

This commit is contained in:
Francesco Giudici
2017-01-10 11:26:09 +01:00
parent 623d888801
commit 3e3d36450c

View File

@@ -1072,11 +1072,16 @@ print_required_fields (NmCli *nmc, const NmcOutputField field_values[])
gboolean section_prefix = field_values[0].flags & NMC_OF_FLAG_SECTION_PREFIX; gboolean section_prefix = field_values[0].flags & NMC_OF_FLAG_SECTION_PREFIX;
gboolean main_header = main_header_add || main_header_only; gboolean main_header = main_header_add || main_header_only;
/* No headers are printed in terse mode: if (terse) {
* - neither main header nor field (column) names /* No headers are printed in terse mode:
*/ * - neither main header nor field (column) names
if ((main_header_only || field_names) && terse) */
return; if (main_header_only || field_names)
return;
/* Don't substitute empty strings in terse mode */
not_set_str = "";
}
if (multiline) { if (multiline) {
/* --- Multiline mode --- */ /* --- Multiline mode --- */