summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAn-Cheng Huang <ancheng@vyatta.com>2011-02-01 16:52:41 -0800
committerAn-Cheng Huang <ancheng@vyatta.com>2011-02-01 16:52:41 -0800
commit0e51f32d8fa8a8cff5d844e3c6802e1d4372cee8 (patch)
treee9cadcf5ad8cef63f696d00336eacadfbe50c06e /src
parentfc93be515964a3e65abb3b67fd0c1582e3d88993 (diff)
downloadvyatta-cfg-0e51f32d8fa8a8cff5d844e3c6802e1d4372cee8.tar.gz
vyatta-cfg-0e51f32d8fa8a8cff5d844e3c6802e1d4372cee8.zip
disable template abort
Diffstat (limited to 'src')
-rw-r--r--src/cstore/cstore.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/cstore/cstore.cpp b/src/cstore/cstore.cpp
index b6b55be..fa9b639 100644
--- a/src/cstore/cstore.cpp
+++ b/src/cstore/cstore.cpp
@@ -2181,8 +2181,9 @@ Cstore::get_parsed_tmpl(const vector<string>& path_comps, bool validate_vals,
if (tmpl_node_exists()) {
// case (1). last component is "node".
if (!tmpl_parse(def)) {
- exit_internal("failed to parse tmpl [%s]\n",
- tmpl_path_to_str().c_str());
+ output_internal("failed to parse tmpl [%s]\n",
+ tmpl_path_to_str().c_str());
+ break;
}
def.is_value = 0;
ret = true;
@@ -2374,7 +2375,10 @@ Cstore::set_cfg_path(const vector<string>& path_comps, bool output)
for (size_t i = 0; i < ppath.size(); i++) {
output_internal(" [%s]\n", ppath[i].c_str());
}
- exit_internal("failed to get tmpl during set. not validate first?\n");
+ output_internal("failed to get tmpl during set. not validate first?\n");
+ ret = false;
+ path_exists = false;
+ break;
}
// nop if this level already in working (including deactivated)