From 96775a1c0c646e8b860ccfbd63ff6d71e355c6b0 Mon Sep 17 00:00:00 2001 From: Joe Stringer Date: Mon, 18 May 2015 10:26:14 -0700 Subject: [PATCH] ofp-actions: Improve conjunction error message. Signed-off-by: Joe Stringer Acked-by: Ben Pfaff --- lib/ofp-actions.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 2240b86af..e18229da6 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -5721,8 +5721,9 @@ ofpacts_verify(const struct ofpact ofpacts[], size_t ofpacts_len, if (a->type == OFPACT_CONJUNCTION) { OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) { if (a->type != OFPACT_CONJUNCTION) { - VLOG_WARN("when %s action is present, it must be the only " - "kind of action used", ofpact_name(a->type)); + VLOG_WARN("when conjunction action is present, it must be " + "the only kind of action used (saw '%s' action)", + ofpact_name(a->type)); return OFPERR_NXBAC_BAD_CONJUNCTION; } } -- 2.20.1