From d0adfd7756ddc627c569957febe0fdf529dc7414 Mon Sep 17 00:00:00 2001 From: Jakub Sitnicki Date: Mon, 2 Jul 2018 12:50:18 +0200 Subject: db-ctl-base: Don't die in cmd_clear() on error. Return the error via the context instead of calling ctl_fatal() so that the caller can decide how to handle it. Signed-off-by: Jakub Sitnicki Signed-off-by: Ben Pfaff --- lib/db-ctl-base.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/db-ctl-base.c b/lib/db-ctl-base.c index 41891c42b..ef35ee98c 100644 --- a/lib/db-ctl-base.c +++ b/lib/db-ctl-base.c @@ -1661,9 +1661,10 @@ cmd_clear(struct ctl_context *ctx) type = &column->type; if (type->n_min > 0) { - ctl_fatal("\"clear\" operation cannot be applied to column %s " - "of table %s, which is not allowed to be empty", + ctl_error(ctx, "\"clear\" operation cannot be applied to column " + "%s of table %s, which is not allowed to be empty", column->name, table->name); + return; } ovsdb_datum_init_empty(&datum); -- cgit v1.2.1