Merged from trunk 9150:9151

   | 9151    | Bug #204651 - Make repoman respect NOCOLOR=true.             |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=9154

diff --git a/pym/portage/output.py b/pym/portage/output.py
index 148fddd0fdb7d09b60fd4061caec399bb0815c80..c491897f48760307cab33e9d707ea8f7b5835b64 100644 (file)
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -331,7 +331,8 @@ class ConsoleStyleFile(object):
                self._styles = styles
 
        def write(self, s):
-               if self._styles:
+               global havecolor
+               if havecolor and self._styles:
                        for style in self._styles:
                                self._file.write(codes[style])
                        self._file.write(s)