From 5a4e40bacfcd24679046f745ea0e18877d5ec267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Thu, 7 Nov 2013 18:01:16 +0100 Subject: [PATCH] cli: fix 'nmcli con up bad_name' or 'nmcli con up' ** (process:25157): CRITICAL **: nmc_activate_connection: assertion `NM_IS_CONNECTION (connection) || ifname' failed Error: unknown error. Regression caused by 42c7ea85a17a7e7459942f356399e36308011c86. --- cli/src/connections.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cli/src/connections.c b/cli/src/connections.c index 8dac4f10c9..972c9c3cf5 100644 --- a/cli/src/connections.c +++ b/cli/src/connections.c @@ -1517,7 +1517,6 @@ nmc_activate_connection (NmCli *nmc, GError *local = NULL; g_return_val_if_fail (nmc != NULL, FALSE); - g_return_val_if_fail (NM_IS_CONNECTION (connection) || ifname, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); if (connection) { @@ -1541,7 +1540,7 @@ nmc_activate_connection (NmCli *nmc, } } else { g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_CON_ACTIVATION, - _("no connection and no device given.")); + _("neither a valid connection nor device given")); return FALSE; }