From 8052c546f9d4f3b7dad58c99d9eeff23966ba3bf Mon Sep 17 00:00:00 2001 From: Michael Larson Date: Thu, 3 Jun 2010 11:47:53 -0700 Subject: fixed break in regression on action failures. will revisit compilier warning for this conditional statement in subsequent checkin. --- src/commit2.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/commit2.c b/src/commit2.c index d511458..01631d6 100644 --- a/src/commit2.c +++ b/src/commit2.c @@ -731,12 +731,11 @@ sort_func(GNode *node, gpointer data, boolean priority_mode) } //change action state of node according to enclosing behavior - if (((G_NODE_IS_ROOT(node) == FALSE) && - (((struct VyattaNode*)gp)->_data._disable_op != K_NO_DISABLE_OP)) || //added to support enclosing behavior of activated/deactivated nodes + if ((G_NODE_IS_ROOT(node) == FALSE) && + (((struct VyattaNode*)gp)->_data._disable_op != K_NO_DISABLE_OP) || //added to support enclosing behavior of activated/deactivated n ((IS_SET_OR_CREATE(op)) || - (((IS_DELETE(op))) && - (IS_NOOP(((struct VyattaNode*)(node->parent->data))->_data._operation))))) { - + (IS_DELETE(op))) && + (IS_NOOP(((struct VyattaNode*)(node->parent->data))->_data._operation))) { //first check if there is enclosing behavior boolean enclosing = FALSE; GNode *n = node; -- cgit v1.2.3