ofp-actions: Improve conjunction error message.
authorJoe Stringer <joestringer@nicira.com>
Mon, 18 May 2015 17:26:14 +0000 (10:26 -0700)
committerJoe Stringer <joestringer@nicira.com>
Thu, 28 May 2015 17:07:09 +0000 (10:07 -0700)
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
lib/ofp-actions.c

index 2240b86..e18229d 100644 (file)
@@ -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;
                 }
             }