summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-11 23:31:56 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-11 23:31:56 +0000
commit12a93af5222190dafc4b503f2c5b659a31b2ac79 (patch)
tree271a9843467cc7e70875f9cc8f2ce731fdbc1f9e
parent55f6cd224b020628d493d6c9e8965103ff7ca9c4 (diff)
downloadportage-12a93af5222190dafc4b503f2c5b659a31b2ac79.tar.gz
portage-12a93af5222190dafc4b503f2c5b659a31b2ac79.tar.bz2
portage-12a93af5222190dafc4b503f2c5b659a31b2ac79.zip
Bug #241808 - When loading options for --resume, discard the --color option
so it doesn't override the current setting. svn path=/main/trunk/; revision=12428
-rw-r--r--pym/_emerge/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 123aa3f34..1aa104c19 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -13769,7 +13769,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)