diff options
| author | slioch <slioch@eng-140.vyatta.com> | 2009-04-06 23:39:16 -0700 |
|---|---|---|
| committer | slioch <slioch@eng-140.vyatta.com> | 2009-04-06 23:39:16 -0700 |
| commit | 03ad6e222132da3782a43bda15e11016640b7e47 (patch) | |
| tree | 492f463f6939542d9b9fff8676f3b4d73f36d08a | |
| parent | f483976e90498a8a69534045838ccb898a8f3c11 (diff) | |
| download | vyatta-cfg-03ad6e222132da3782a43bda15e11016640b7e47.tar.gz vyatta-cfg-03ad6e222132da3782a43bda15e11016640b7e47.zip | |
Handle commit failure processing within priority group correctly. Processing now stops on failure within priority group (expected behavior).
| -rw-r--r-- | src/commit2.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/commit2.c b/src/commit2.c index bdac39e..4b543a1 100644 --- a/src/commit2.c +++ b/src/commit2.c @@ -791,13 +791,13 @@ process_priority_node(GNode *priority_node) -1, (GNodeTraverseFunc)process_func, (gpointer)&result); - } - if (result._err_code != 0) { - if (g_debug) { - printf("commit2::process_priority_node(): failure on processing pass: %d\n", i); + if (result._err_code != 0) { + if (g_debug) { + printf("commit2::process_priority_node(): failure on processing pass: %d\n", i); + } + return FALSE; } - return FALSE; } return TRUE; } @@ -847,13 +847,13 @@ enclosing_process_func(GNode *node, gpointer data) -1, (GNodeTraverseFunc)process_func, (gpointer)result); - } - if (result->_err_code != 0) { //EXECUTE_LIST RETURNS FALSE ON FAILURE.... - if (g_debug) { - printf("commit2::enclosing_process_func(): FAILURE: status: %d\n",result->_err_code); + if (result->_err_code != 0) { //EXECUTE_LIST RETURNS FALSE ON FAILURE.... + if (g_debug) { + printf("commit2::enclosing_process_func(): FAILURE: status: %d\n",result->_err_code); + } + return TRUE; //WILL STOP AT THIS POINT } - return TRUE; //WILL STOP AT THIS POINT } } return FALSE; |