From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 5 Feb 2006 20:24:19 +0000 (-0000)
Subject: do commit_mtimedb() after each merge for bug 100300
X-Git-Tag: v2.1_pre5_2760~79
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0fc977f0b8be9de82afa20d58c391973de10a83c;p=portage.git

do commit_mtimedb() after each merge for bug 100300

svn path=/main/trunk/; revision=2669
---

diff --git a/bin/emerge b/bin/emerge
index 081b7f6a4..30ba8ec3d 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2134,6 +2134,10 @@ class depgraph:
 
 			# Unsafe for parallel merges
 			del portage.mtimedb["resume"]["mergelist"][0]
+			# Commit after each merge so that --resume may still work in
+			# in the event that portage is not allowed to exit normally
+			# due to power failure, SIGKILL, etc...
+			portage.commit_mtimedb()
 
 		emergelog(" *** Finished. Cleaning up...")