proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 11:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7025 from opensourcerouting/silence-cli-warning

Browse Source 
lib: silence overly verbose CLI warning
This commit is contained in:
Quentin Young 2020-08-31 14:03:25 -04:00 committed by GitHub
commit ddffdcf728
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/northbound_cli.c
View File

@ -63,7 +63,15 @@ static int nb_cli_classic_commit(struct vty *vty)
context.user = vty; context.user = vty;
ret = nb_candidate_commit(&context, vty->candidate_config, true, NULL, ret = nb_candidate_commit(&context, vty->candidate_config, true, NULL,
NULL, errmsg, sizeof(errmsg)); NULL, errmsg, sizeof(errmsg));
if (ret != NB_OK && ret != NB_ERR_NO_CHANGES) { switch (ret) {
case NB_OK:
/* Successful commit. Print warnings (if any). */
if (strlen(errmsg) > 0)
vty_out(vty, "%s\n", errmsg);
break;
case NB_ERR_NO_CHANGES:
break;
default:
vty_out(vty, "%% Configuration failed.\n\n"); vty_out(vty, "%% Configuration failed.\n\n");
vty_show_nb_errors(vty, ret, errmsg); vty_show_nb_errors(vty, ret, errmsg);
if (vty->t_pending_commit) if (vty->t_pending_commit)
@ -74,9 +82,7 @@ static int nb_cli_classic_commit(struct vty *vty)
/* Regenerate candidate for consistency. */ /* Regenerate candidate for consistency. */
nb_config_replace(vty->candidate_config, running_config, true); nb_config_replace(vty->candidate_config, running_config, true);
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
} else if (strlen(errmsg) > 0) }
/* Successful commit. Print warnings (if any). */
vty_out(vty, "%s\n", errmsg);
return CMD_SUCCESS; return CMD_SUCCESS;
} }