From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 8 Apr 2009 20:23:55 +0000 (-0000)
Subject: Bug #265111 - Make current options override older options for --resume.
X-Git-Tag: v2.2_rc29~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3e20a783357886cb187eb33fe58e9dcab436f7bc;p=portage.git

Bug #265111 - Make current options override older options for --resume.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 0b5a3a69a..11ad3fae1 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -14470,6 +14470,10 @@ def action_build(settings, trees, mtimedb,
 			resume_opts = dict((k,True) for k in resume_opts)
 		for opt in ("--ask", "--color", "--skipfirst", "--tree"):
 			resume_opts.pop(opt, None)
+
+		# Current options always override resume_opts.
+		resume_opts.update(myopts)
+		myopts.clear()
 		myopts.update(resume_opts)
 
 		if "--debug" in myopts: