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

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

Browse Source
This commit is contained in:
Francesco Giudici
2017-01-10 11:26:09 +01:00
parent 623d888801
commit 3e3d36450c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
clients/cli/utils.c
View File

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