summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorslioch <slioch@eng-140.vyatta.com>2009-03-04 09:42:32 -0800
committerslioch <slioch@eng-140.vyatta.com>2009-03-04 09:42:32 -0800
commit2a04ac6d2e0e63317fc3cc30462658c2d0376631 (patch)
treedb26590f38a0aac6ed30ce1fd96c5408881897ca
parentceaae5d10b50f7aca1f4b604909a25ccaef6330f (diff)
downloadvyatta-cfg-2a04ac6d2e0e63317fc3cc30462658c2d0376631.tar.gz
vyatta-cfg-2a04ac6d2e0e63317fc3cc30462658c2d0376631.zip
modified environment variable setting for action on nodes.
-rw-r--r--src/commit2.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/commit2.c b/src/commit2.c
index 5e75151..35f609d 100644
--- a/src/commit2.c
+++ b/src/commit2.c
@@ -337,12 +337,15 @@ process_func(GNode *node, gpointer data)
if (result->_action == delete_act) {
- setenv(ENV_ACTION_NAME,ENV_ACTION_DELETE,1);
set_in_delete_action(TRUE);
}
+ if (IS_DELETE(d->_operation)) {
+ setenv(ENV_ACTION_NAME,ENV_ACTION_DELETE,1);
+ }
else {
setenv(ENV_ACTION_NAME,ENV_ACTION_SET,1);
}
+
status = execute_list(c->_def.actions[result->_action].vtw_list_head,&c->_def);
if (result->_action == delete_act) {
set_in_delete_action(FALSE);