summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-12 08:29:23 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-12 08:29:23 +0000
commit3f0955745d08089375c578f58619f8aa41ea0ef1 (patch)
treed22b9741ffd10b6ff20a53199d5d7262ef310418 /pym
parent27443b055deeab8d0616e908c794462f5025950a (diff)
downloadportage-3f0955745d08089375c578f58619f8aa41ea0ef1.tar.gz
portage-3f0955745d08089375c578f58619f8aa41ea0ef1.tar.bz2
portage-3f0955745d08089375c578f58619f8aa41ea0ef1.zip
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
Diffstat (limited to 'pym')
-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 bdbd3b1c1..45e9c2a35 100644
--- 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)