diff options
| author | slioch <slioch@eng-140.vyatta.com> | 2009-05-01 22:36:30 -0700 |
|---|---|---|
| committer | slioch <slioch@eng-140.vyatta.com> | 2009-05-01 22:36:30 -0700 |
| commit | 7fea99eee01ce6b4804a71928aeeb679f7c2075c (patch) | |
| tree | c245236f8cfcdfa49bde6d1d758d891c635b95a9 /src | |
| parent | bdc0f009be1c8c0230fdafd902f89903c98bee11 (diff) | |
| download | vyatta-cfg-7fea99eee01ce6b4804a71928aeeb679f7c2075c.tar.gz vyatta-cfg-7fea99eee01ce6b4804a71928aeeb679f7c2075c.zip | |
fix for bug 4338. update was being called on active nodes that contained
end/begin transactions. now only end/begin are called on active nodes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/commit2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/commit2.c b/src/commit2.c index e692d1f..70e0e99 100644 --- a/src/commit2.c +++ b/src/commit2.c @@ -319,7 +319,7 @@ process_func(GNode *node, gpointer data) */ if ((IS_SET(d->_operation) && !IS_ACTIVE(d->_operation) && (result->_action != delete_act && result->_action != create_act)) || (IS_CREATE(d->_operation) && !IS_ACTIVE(d->_operation) && (result->_action == syntax_act || result->_action == begin_act || result->_action == end_act || result->_action == create_act || (result->_action == update_act && !c->_def.actions[create_act].vtw_list_head))) || - (IS_SET_OR_CREATE(d->_operation) && IS_ACTIVE(d->_operation) && ((result->_action != delete_act) && (result->_action != create_act))) || + (IS_ACTIVE(d->_operation) && ((result->_action == begin_act) || (result->_action == end_act))) || // (IS_DELETE(d->_operation) && ((result->_action == delete_act) || (result->_action == syntax_act) || (result->_action == begin_act) || (result->_action == end_act)) )) { (IS_DELETE(d->_operation) && ((result->_action == delete_act) || (result->_action == begin_act) || (result->_action == end_act)) )) { //NEED TO ADD IF CREATE, THEN CREATE OR UPDATE |