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 d6c27157fbd7f0861434f05af0594508b725161a..85dbe564487ea31334505b53d39ff0cb51f7d9f8 100644 (file)
--- 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: