Propagate the error via the context instead.
Signed-off-by: Jakub Sitnicki <[email protected]>
---
ovn/utilities/ovn-nbctl.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c
index 56e47c1f0..16788cc43 100644
--- a/ovn/utilities/ovn-nbctl.c
+++ b/ovn/utilities/ovn-nbctl.c
@@ -2442,11 +2442,13 @@ nbctl_ls_lb_add(struct ctl_context *ctx)
char *error = ls_by_name_or_uuid(ctx, ctx->argv[1], true, &ls);
if (error) {
- ctl_fatal("%s", error);
+ ctx->error = error;
+ return;
}
error = lb_by_name_or_uuid(ctx, ctx->argv[2], true, &new_lb);
if (error) {
- ctl_fatal("%s", error);
+ ctx->error = error;
+ return;
}
bool may_exist = shash_find(&ctx->options, "--may-exist") != NULL;
@@ -2458,8 +2460,9 @@ nbctl_ls_lb_add(struct ctl_context *ctx)
if (may_exist) {
return;
}
- ctl_fatal(UUID_FMT " : a load balancer with this UUID already "
- "exists", UUID_ARGS(&lb->header_.uuid));
+ ctl_error(ctx, UUID_FMT " : a load balancer with this UUID "
+ "already exists", UUID_ARGS(&lb->header_.uuid));
+ return;
}
}
--
2.14.4
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
