From 113b5ee593fd3196e2b1c828c3dd82032758e492 Mon Sep 17 00:00:00 2001 From: An-Cheng Huang Date: Thu, 5 May 2011 16:25:48 +0800 Subject: clean up when committing no changes --- src/commit/commit-algorithm.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src') diff --git a/src/commit/commit-algorithm.cpp b/src/commit/commit-algorithm.cpp index 89a6dfe..ad775df 100644 --- a/src/commit/commit-algorithm.cpp +++ b/src/commit/commit-algorithm.cpp @@ -1136,6 +1136,21 @@ commit::doCommit(Cstore& cs, CfgNode& cfg1, CfgNode& cfg2) CfgNode *root = getCommitTree(&cfg1, &cfg2, p); if (!root) { OUTPUT_USER("No configuration changes to commit\n"); + /* call the low-level commitConfig() function with a dummy structure + * representing successful commit on the whole tree. this is equivalent + * to copying the whole working config back to the active config. since + * the two are "logically" the same, this is redundant in most cases. + * however, in some cases, this gives the low-level implementation a + * chance to clean up any intermediate state that are no longer needed. + */ + Cpath rp; + auto_ptr cn(new CfgNode(rp, NULL, NULL, NULL, 0, &cs, false)); + PrioNode pn(cn.get()); + pn.setSucceeded(true); + if (!cs.commitConfig(pn)) { + OUTPUT_USER("Failed to generate committed config\n"); + return false; + } return true; } @@ -1186,6 +1201,9 @@ commit::doCommit(Cstore& cs, CfgNode& cfg1, CfgNode& cfg2) OUTPUT_USER("Failed to clear committed markers\n"); ret = false; } + if (ret) { + ret = cs.markSessionUnsaved(); + } return ret; } -- cgit v1.2.3