From 3273b3f5feace0bb8f5f84e1e0bd924cdc866a54 Mon Sep 17 00:00:00 2001 From: An-Cheng Huang Date: Fri, 19 Nov 2010 14:47:30 -0800 Subject: fix existence check in "syntax" when builtin expression is used. --- src/cstore/cstore-varref.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cstore/cstore-varref.cpp b/src/cstore/cstore-varref.cpp index 02bdb97..ac80ba2 100644 --- a/src/cstore/cstore-varref.cpp +++ b/src/cstore/cstore-varref.cpp @@ -238,7 +238,9 @@ Cstore::VarRef::getValue(string& value, vtw_type_e& def_type) } if (_paths[i].second == ERROR_TYPE && !_cstore->cfgPathExists(_paths[i].first, _active)) { - // path doesn't exist + // path doesn't exist => empty string + added[""] = true; + result.push_back(""); continue; } if (_paths[i].second != ERROR_TYPE) { -- cgit v1.2.3 From 6221c9a70e90d7e9c369f1c81f7a377f48ab7d3a Mon Sep 17 00:00:00 2001 From: An-Cheng Huang Date: Fri, 19 Nov 2010 14:48:08 -0800 Subject: 0.18.31 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9fceb07..1121403 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg (0.18.31) unstable; urgency=low + + * fix existence check in "syntax" when builtin expression is used. + + -- An-Cheng Huang Fri, 19 Nov 2010 14:48:08 -0800 + vyatta-cfg (0.18.30) unstable; urgency=low * remove parser debug output and move existence check. -- cgit v1.2.3 From d2b89eee76f52303c6d88ff04a2fcf030e5a9e2c Mon Sep 17 00:00:00 2001 From: An-Cheng Huang Date: Fri, 19 Nov 2010 15:20:42 -0800 Subject: fix for bug 6448 * fix leaf node value diff output. --- src/cnode/cnode-algorithm.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cnode/cnode-algorithm.cpp b/src/cnode/cnode-algorithm.cpp index 405ab4f..fa3912c 100644 --- a/src/cnode/cnode-algorithm.cpp +++ b/src/cnode/cnode-algorithm.cpp @@ -180,7 +180,7 @@ _diff_check_and_show_leaf(CfgNode *cfg1, CfgNode *cfg2, int level, // need to actually do a diff. // this follows the original perl logic. const vector& ovec = cfg1->getValues(); - const vector& nvec = cfg1->getValues(); + const vector& nvec = cfg2->getValues(); vector values; vector pfxs; Cstore::MapT nmap; @@ -217,9 +217,10 @@ _diff_check_and_show_leaf(CfgNode *cfg1, CfgNode *cfg2, int level, } else { // single-value node if (show_def || !cfg->isDefault()) { - const string& val = cfg->getValue(); + string val = cfg->getValue(); if (!force_pfx_diff) { const string& val1 = cfg1->getValue(); + val = cfg2->getValue(); if (val == val1) { force_pfx_diff = PFX_DIFF_NONE.c_str(); } else { -- cgit v1.2.3 From a8d9cedfcde6c87e69ebebf2e6d3cca28808d7e8 Mon Sep 17 00:00:00 2001 From: An-Cheng Huang Date: Fri, 19 Nov 2010 15:21:13 -0800 Subject: 0.18.32 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1121403..4080b24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg (0.18.32) unstable; urgency=low + + * fix for bug 6448 + + -- An-Cheng Huang Fri, 19 Nov 2010 15:21:13 -0800 + vyatta-cfg (0.18.31) unstable; urgency=low * fix existence check in "syntax" when builtin expression is used. -- cgit v1.2.3 From 2af6ccd492d39fb4f089b8ac7d75ce5934a70b03 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 19 Nov 2010 07:28:53 -0800 Subject: proper exit on failure. --- src/commit2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commit2.c b/src/commit2.c index e1119b4..aeb9ce7 100644 --- a/src/commit2.c +++ b/src/commit2.c @@ -401,7 +401,7 @@ main(int argc, char** argv) //remove tmp changes file as all the work is now done unlink(COMMIT_CHANGES_FILE); - exit (errors == 2); + exit (errors == 2 ? 0 : 1); } -- cgit v1.2.3 From 9ed305de8fc62e8ee17627f85e7d3efc82719b78 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 19 Nov 2010 07:30:20 -0800 Subject: 0.18.33 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4080b24..e0bc9ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg (0.18.33) unstable; urgency=low + + * proper exit on failure. + + -- Michael Fri, 19 Nov 2010 07:30:20 -0800 + vyatta-cfg (0.18.32) unstable; urgency=low * fix for bug 6448 -- cgit v1.2.3