diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-09-08 08:24:09 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-09-08 08:24:09 -0700 |
| commit | 134f35f838d444d63a1774b986380264e7089c6e (patch) | |
| tree | f720a657594a52bdb611dabef15b85ae531ffce5 /src/cli_bin.cpp | |
| parent | b1c8827efedc245d47f89cf8b4db30f495498ae7 (diff) | |
| parent | 5a4ac0f6fc5fa0a25663f7834fef4cbd5ba98ecd (diff) | |
| download | vyatta-cfg-134f35f838d444d63a1774b986380264e7089c6e.tar.gz vyatta-cfg-134f35f838d444d63a1774b986380264e7089c6e.zip | |
Merge branch 'mendocino' of suva.vyatta.com:/git/vyatta-cfg into mendocino
Diffstat (limited to 'src/cli_bin.cpp')
| -rw-r--r-- | src/cli_bin.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/cli_bin.cpp b/src/cli_bin.cpp index 25a86ce..5823c02 100644 --- a/src/cli_bin.cpp +++ b/src/cli_bin.cpp @@ -165,8 +165,6 @@ doDiscard(Cstore& cstore, const vector<string>& args) if (!cstore.discardChanges()) { bye("discard failed\n"); } - // special case for discard: don't return (don't want to mark changed) - exit(0); } static void @@ -228,7 +226,6 @@ main(int argc, char **argv) // call the op function OpFunc[op_idx](cstore, path_comps); - cstore.markCfgPathChanged(path_comps); exit(0); } |