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

cli: fix 'nmcli con up bad_name' or 'nmcli con up'

Browse Source 
** (process:25157): CRITICAL **: nmc_activate_connection: assertion `NM_IS_CONNECTION (connection) || ifname' failed
Error: unknown error.

Regression caused by 42c7ea85a1.
This commit is contained in:
Jiří Klimeš
2013-11-07 18:01:16 +01:00
parent 6a60dc2fe9
commit 5a4e40bacf
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cli/src/connections.c
View File

@@ -1517,7 +1517,6 @@ nmc_activate_connection (NmCli *nmc,
GError *local = NULL; GError *local = NULL;
g_return_val_if_fail (nmc != NULL, FALSE); 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); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
if (connection) { if (connection) {
@@ -1541,7 +1540,7 @@ nmc_activate_connection (NmCli *nmc,
} }
} else { } else {
g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_CON_ACTIVATION, 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; return FALSE;
} }