From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 7 Aug 2008 14:00:24 +0000 (-0000)
Subject: In order to properly preserve --jobs and --load-average settings for --resume
X-Git-Tag: v2.2_rc7~39
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5dcc067352215541124bb4a28cef82f421494f9d;p=portage.git

In order to properly preserve --jobs and --load-average settings for --resume
operations, store resume options in the mtimedb as a dict instead of a list.
The dict type is supported in >=portage-2.1.3_rc8 (2.1.4.4 is current stable)
so people switching between stable/unstable will be fine.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a0c7c7378..b72f964a4 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -12450,6 +12450,10 @@ def action_build(settings, trees, mtimedb,
 		for opt in ("--skipfirst", "--ask", "--tree"):
 			resume_opts.pop(opt, None)
 		myopts.update(resume_opts)
+
+		if "--debug" in myopts:
+			writemsg_level("myopts %s\n" % (myopts,))
+
 		# Adjust config according to options of the command being resumed.
 		for myroot in trees:
 			mysettings =  trees[myroot]["vartree"].settings
@@ -12779,9 +12783,10 @@ def action_build(settings, trees, mtimedb,
 				del mtimedb["resume"]
 				mtimedb.commit()
 			mtimedb["resume"]={}
-			# XXX: Stored as a list for backward compatibility.
-			mtimedb["resume"]["myopts"] = \
-				[k for k in myopts if myopts[k] is True]
+			# Stored as a dict starting with portage-2.2_rc7, and supported
+			# by >=portage-2.1.3_rc8. Versions <portage-2.1.3_rc8 only support
+			# a list type for options.
+			mtimedb["resume"]["myopts"] = myopts.copy()
 
 			# Convert Atom instances to plain str since the mtimedb loader
 			# sets unpickler.find_global = None which causes unpickler.load()