system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 12:34:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli: avoid bogus line seprator in pretty-output

Browse source 
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: 16299e5ac0
This commit is contained in:
Thomas Haller 2018-04-26 21:09:43 +02:00
parent 5090c1f255
commit e1bbc2e155
5 changed files with 5 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
clients/cli/utils.c
View file

@ -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, '-')));

17
clients/tests/test-client.check-on-disk/test_001-011.expected
View file

@ -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
<<<

17
clients/tests/test-client.check-on-disk/test_001-012.expected
View file

@ -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
<<<

17
clients/tests/test-client.check-on-disk/test_001-017.expected
View file

@ -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
<<<

17
clients/tests/test-client.check-on-disk/test_001-018.expected
View file

@ -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
<<<