diff options
| author | Michael Larson <slioch@slioch.vyatta.com> | 2010-06-03 11:47:53 -0700 |
|---|---|---|
| committer | Michael Larson <slioch@slioch.vyatta.com> | 2010-06-03 11:47:53 -0700 |
| commit | 8052c546f9d4f3b7dad58c99d9eeff23966ba3bf (patch) | |
| tree | e563d207a676d1b9ad79893e57e6181b96f91cfb /src | |
| parent | 80369a816eea6fd86e3e11bd877673ec4d12d7d2 (diff) | |
| download | vyatta-cfg-8052c546f9d4f3b7dad58c99d9eeff23966ba3bf.tar.gz vyatta-cfg-8052c546f9d4f3b7dad58c99d9eeff23966ba3bf.zip | |
fixed break in regression on action failures. will revisit compilier warning for this conditional
statement in subsequent checkin.
Diffstat (limited to 'src')
| -rw-r--r-- | src/commit2.c | 9 |
1 files changed, 4 insertions, 5 deletions
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; |