| Message ID | 20180717133415.23781-11-jkbs@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Get rid of ctl_fatal() calls in ovn-nbctl (part 2) | expand |
On Tue, Jul 17, 2018 at 03:34:14PM +0200, Jakub Sitnicki wrote: > Fix fall-out from applying a semantic patch that converts ctl_fatal() > calls to use ctl_error(). > > Signed-off-by: Jakub Sitnicki <jkbs@redhat.com> Oh, you fixed that up later ;-). Ha, I'll revert it to your way instead, never mind.
On Mon, 23 Jul 2018 15:38:55 -0700 Ben Pfaff <blp@ovn.org> wrote: > On Tue, Jul 17, 2018 at 03:34:14PM +0200, Jakub Sitnicki wrote: > > Fix fall-out from applying a semantic patch that converts ctl_fatal() > > calls to use ctl_error(). > > > > Signed-off-by: Jakub Sitnicki <jkbs@redhat.com> > > Oh, you fixed that up later ;-). Ha, I'll revert it to your way > instead, never mind. Yes, I've decided to do fix-ups separately so that the Coccinelle-generated patches could be reviewed based on the semantic patch. Not sure if that worked out fine or just created confusion. -Jakub
On Tue, Jul 24, 2018 at 03:20:25PM +0200, Jakub Sitnicki wrote: > On Mon, 23 Jul 2018 15:38:55 -0700 > Ben Pfaff <blp@ovn.org> wrote: > > > On Tue, Jul 17, 2018 at 03:34:14PM +0200, Jakub Sitnicki wrote: > > > Fix fall-out from applying a semantic patch that converts ctl_fatal() > > > calls to use ctl_error(). > > > > > > Signed-off-by: Jakub Sitnicki <jkbs@redhat.com> > > > > Oh, you fixed that up later ;-). Ha, I'll revert it to your way > > instead, never mind. > > Yes, I've decided to do fix-ups separately so that the > Coccinelle-generated patches could be reviewed based on the semantic > patch. Not sure if that worked out fine or just created confusion. I thought that these two were OK, but I'd probably insist on squashing if one of the fix-ups could cause bisection problems.
diff --git a/ovn/utilities/ovn-nbctl.c b/ovn/utilities/ovn-nbctl.c index 8301e74cc..27e3151a8 100644 --- a/ovn/utilities/ovn-nbctl.c +++ b/ovn/utilities/ovn-nbctl.c @@ -1149,7 +1149,6 @@ nbctl_lsp_del(struct ctl_context *ctx) /* Can't happen because of the database schema. */ ctl_error(ctx, "logical port %s is not part of any logical switch", ctx->argv[1]); - return; } static void @@ -3787,7 +3786,6 @@ nbctl_lrp_del(struct ctl_context *ctx) /* Can't happen because of the database schema. */ ctl_error(ctx, "logical port %s is not part of any logical router", ctx->argv[1]); - return; } /* Print a list of logical router ports. */
Fix fall-out from applying a semantic patch that converts ctl_fatal() calls to use ctl_error(). Signed-off-by: Jakub Sitnicki <jkbs@redhat.com> --- ovn/utilities/ovn-nbctl.c | 2 -- 1 file changed, 2 deletions(-)