From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 07:01:03 +0000 (-0000)
Subject: Bug #265111 - Make current options override older options for --resume.
X-Git-Tag: v2.1.6.12~100
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=60f3f096f6e00e99dd48ba5aa9d689dc6cb6e75f;p=portage.git

Bug #265111 - Make current options override older options for --resume.
(trunk r13302)

svn path=/main/branches/2.1.6/; revision=13473
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index d6c27157f..85dbe5644 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -14116,6 +14116,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: