diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-04-26 21:09:43 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-05-25 17:36:47 +0200 |
| commit | e1bbc2e1556e8211054f14a5da4f43cded83a3e1 (patch) | |
| tree | b59056dfcc9e2a5476c0727963e474a0b5f0b8dc | |
| parent | 5090c1f2556909a9f4404ee0ec89d712a92b40d8 (diff) | |
| download | NetworkManager-e1bbc2e1556e8211054f14a5da4f43cded83a3e1.tar.gz | |
cli: avoid bogus line seprator in pretty-output
This bug resulted in spurious lines with "--pretty --mode tabular",
whenever nmc_print() was called with multiple rows.
Currently, the only case where this was visible was with:
$ nmcli --pretty general permissions
(note that "--mode tabular" is the default).
Fixes: 16299e5ac0a8882e13d42122278013b74bc6d34d
5 files changed, 5 insertions, 66 deletions
diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 958da08100..32c44e39ce 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -1301,8 +1301,7 @@ _print_do (const NmcConfig *nmc_config, } if ( pretty - && ( i_row < row_len - 1 - || multiline)) { + && multiline) { gs_free char *line = NULL; g_print ("%s\n", (line = g_strnfill (ML_HEADER_WIDTH, '-'))); diff --git a/clients/tests/test-client.check-on-disk/test_001-011.expected b/clients/tests/test-client.check-on-disk/test_001-011.expected index ac036c9744..739d1aeef6 100644 --- a/clients/tests/test-client.check-on-disk/test_001-011.expected +++ b/clients/tests/test-client.check-on-disk/test_001-011.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:591:test_001()/11 cmd: $NMCLI --pretty general permissions lang: C returncode: 0 -stdout: 2672 bytes +stdout: 1472 bytes >>> ============================== NetworkManager permissions @@ -10,35 +10,20 @@ stdout: 2672 bytes PERMISSION VALUE --------------------------------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-network yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-wifi yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-wwan yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-wimax yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.sleep-wake no -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.network-control yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.wifi.share.protected yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.wifi.share.open yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.system yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.own yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.hostname yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.global-dns no -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.reload no -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.checkpoint-rollback unknown -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-statistics unknown -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< diff --git a/clients/tests/test-client.check-on-disk/test_001-012.expected b/clients/tests/test-client.check-on-disk/test_001-012.expected index 961227f93b..f9d557ffe1 100644 --- a/clients/tests/test-client.check-on-disk/test_001-012.expected +++ b/clients/tests/test-client.check-on-disk/test_001-012.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:591:test_001()/12 cmd: $NMCLI --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 -stdout: 2719 bytes +stdout: 1519 bytes >>> ===================================== Uprawnienia usługi NetworkManager @@ -10,35 +10,20 @@ stdout: 2719 bytes PERMISSION VALUE ----------------------------------------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-network tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-wifi tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-wwan tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-wimax tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.sleep-wake nie -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.network-control tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.wifi.share.protected tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.wifi.share.open tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.system tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.own tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.hostname tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.global-dns nie -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.reload nie -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.checkpoint-rollback nieznane -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-statistics nieznane -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< diff --git a/clients/tests/test-client.check-on-disk/test_001-017.expected b/clients/tests/test-client.check-on-disk/test_001-017.expected index 9c5f8e37f9..300f608b9b 100644 --- a/clients/tests/test-client.check-on-disk/test_001-017.expected +++ b/clients/tests/test-client.check-on-disk/test_001-017.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:591:test_001()/17 cmd: $NMCLI --mode tabular --pretty general permissions lang: C returncode: 0 -stdout: 2672 bytes +stdout: 1472 bytes >>> ============================== NetworkManager permissions @@ -10,35 +10,20 @@ stdout: 2672 bytes PERMISSION VALUE --------------------------------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-network yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-wifi yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-wwan yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-wimax yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.sleep-wake no -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.network-control yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.wifi.share.protected yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.wifi.share.open yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.system yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.own yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.hostname yes -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.global-dns no -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.reload no -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.checkpoint-rollback unknown -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-statistics unknown -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-connectivity-check unknown <<< diff --git a/clients/tests/test-client.check-on-disk/test_001-018.expected b/clients/tests/test-client.check-on-disk/test_001-018.expected index 366e592ad5..5d871fd54b 100644 --- a/clients/tests/test-client.check-on-disk/test_001-018.expected +++ b/clients/tests/test-client.check-on-disk/test_001-018.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:591:test_001()/18 cmd: $NMCLI --mode tabular --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 -stdout: 2719 bytes +stdout: 1519 bytes >>> ===================================== Uprawnienia usługi NetworkManager @@ -10,35 +10,20 @@ stdout: 2719 bytes PERMISSION VALUE ----------------------------------------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-network tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-wifi tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-wwan tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-wimax tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.sleep-wake nie -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.network-control tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.wifi.share.protected tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.wifi.share.open tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.system tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.own tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.hostname tak -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.settings.modify.global-dns nie -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.reload nie -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.checkpoint-rollback nieznane -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-statistics nieznane -------------------------------------------------------------------------------- org.freedesktop.NetworkManager.enable-disable-connectivity-check nieznane <<< |