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 0b5a3a69a525defbbad4ce3f1a93e75d91f1b9eb..11ad3fae120cb7e67cd8a5242d7ba0712d27b920 100644 (file)
--- 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: