fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 02:30:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nmcli: don't warn version mismatch with daemon not running

Browse source 
Fixes: fb851f3294 ('nmcli: warn if daemon version mismatch')

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1750
This commit is contained in:
Íñigo Huguet 2023-10-09 14:06:45 +02:00
parent 81fdd4da3a
commit 123ca26770
4 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -5526,6 +5526,7 @@ EXTRA_DIST += \
src/tests/client/test-client.check-on-disk/test_004.expected \
src/tests/client/test-client.check-on-disk/test_offline.expected \
src/tests/client/test-client.check-on-disk/test_version_warn.expected \
src/tests/client/test-client.check-on-disk/test_daemon_not_running.expected \
\
src/tests/client/meson.build \
$(NULL)

3
src/nmcli/utils.c
View file

@ -1830,6 +1830,9 @@ nmc_warn_if_version_mismatch(NMClient *client)
g_return_if_fail(client != NULL);
if (!nm_client_get_nm_running(client))
return;
nm_ver = nm_client_get_version(client);
if (!nm_streq0(nm_ver, VERSION)) {
g_printerr(_("Warning: nmcli (%s) and NetworkManager (%s) versions don't match. "

10
src/tests/client/test-client.check-on-disk/test_daemon_not_running.expected Normal file
View file

@ -0,0 +1,10 @@
size: 170
location: src/tests/client/test-client.py:test_daemon_not_running()/1
cmd: $NMCLI c
lang: C
returncode: 8
stderr: 38 bytes
>>>
Error: NetworkManager is not running.
<<<

4
src/tests/client/test-client.py
View file

@ -2269,6 +2269,10 @@ class TestNmcli(unittest.TestCase):
],
)
@nm_test_no_dbus
def test_daemon_not_running(self):
self.call_nmcli(["c"])
###############################################################################