From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 30 Jun 2006 07:20:11 +0000 (-0000)
Subject: Make use of the new mtimdb.commit() method.
X-Git-Tag: v2.1.1~336
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1df9f2006556a859d55e9b45af6595a8e4ec99a2;p=portage.git

Make use of the new mtimdb.commit() method.

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

diff --git a/bin/emerge b/bin/emerge
index 9a51b3fd3..70709871a 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1721,6 +1721,7 @@ class depgraph:
 					"\n".join(myfavdict.values()))
 
 			mtimedb["resume"]["mergelist"]=mymergelist[:]
+			mtimedb.commit()
 
 		# We need to yank the harmful-to-new-builds settings from features.
 		myorigfeat=self.pkgsettings["FEATURES"]
@@ -2023,7 +2024,7 @@ class depgraph:
 			# 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()
+			mtimedb.commit()
 
 		emergelog(xterm_titles, " *** Finished. Cleaning up...")
 
@@ -3237,7 +3238,7 @@ def action_build(settings, portdb, trees, mtimedb,
 		if "resume" not in mtimedb:
 			mtimedb["resume"] = mtimedb["resume_backup"]
 			del mtimedb["resume_backup"]
-			portage.commit_mtimedb()
+			mtimedb.commit()
 		myresumeopts=mtimedb["resume"]["myopts"][:]
 
 		for opt in ("--skipfirst", "--ask", "--tree"):
@@ -3354,7 +3355,7 @@ def action_build(settings, portdb, trees, mtimedb,
 			len(mtimedb["resume"]["mergelist"]) > 1:
 				mtimedb["resume_backup"] = mtimedb["resume"]
 				del mtimedb["resume"]
-				portage.commit_mtimedb()
+				mtimedb.commit()
 			mtimedb["resume"]={}
 			mtimedb["resume"]["myopts"]=myopts
 			mtimedb["resume"]["favorites"]=favorites