Bug #241808 - When loading options for --resume, discard the --color option

so it doesn't override the current setting. (trunk r12428)

svn path=/main/branches/2.1.6/; revision=12482

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index bdbd3b1c1d67b5b32281f8c6e75e156324572823..45e9c2a359d3807c631fd8738219ec2346dfb143 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -13415,7 +13415,7 @@ def action_build(settings, trees, mtimedb,
                resume_opts = mtimedb["resume"].get("myopts", [])
                if isinstance(resume_opts, list):
                        resume_opts = dict((k,True) for k in resume_opts)
-               for opt in ("--skipfirst", "--ask", "--tree"):
+               for opt in ("--ask", "--color", "--skipfirst", "--tree"):
                        resume_opts.pop(opt, None)
                myopts.update(resume_opts)