tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-25 22:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix --no-ansi flag not working properly

Browse Source 
Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
This commit is contained in:
Cecile Tonglet 2017-08-22 15:46:55 +02:00 committed by Joffrey F
parent ebbf48e606
commit 9e88b15172
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compose/parallel.py
View File

@ -49,16 +49,16 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None, limit=None):
for obj, result, exception in events: for obj, result, exception in events:
if exception is None: if exception is None:
writer.write(get_name(obj), green('done')) writer.write(get_name(obj), 'done', green)
results.append(result) results.append(result)
elif isinstance(exception, APIError): elif isinstance(exception, APIError):
errors[get_name(obj)] = exception.explanation errors[get_name(obj)] = exception.explanation
writer.write(get_name(obj), red('error')) writer.write(get_name(obj), 'error', red)
elif isinstance(exception, (OperationFailedError, HealthCheckFailed, NoHealthCheckConfigured)): elif isinstance(exception, (OperationFailedError, HealthCheckFailed, NoHealthCheckConfigured)):
errors[get_name(obj)] = exception.msg errors[get_name(obj)] = exception.msg
writer.write(get_name(obj), red('error')) writer.write(get_name(obj), 'error', red)
elif isinstance(exception, UpstreamError): elif isinstance(exception, UpstreamError):
writer.write(get_name(obj), red('error')) writer.write(get_name(obj), 'error', red)
else: else:
errors[get_name(obj)] = exception errors[get_name(obj)] = exception
error_to_reraise = exception error_to_reraise = exception
@ -263,13 +263,13 @@ class ParallelStreamWriter(object):
status, width=self.width)) status, width=self.width))
self.stream.flush() self.stream.flush()
def write(self, obj_index, status): def write(self, obj_index, status, color_func):
if self.msg is None: if self.msg is None:
return return
if self.noansi: if self.noansi:
self._write_noansi(obj_index, status) self._write_noansi(obj_index, status)
else: else:
self._write_ansi(obj_index, status) self._write_ansi(obj_index, color_func(status))
def parallel_operation(containers, operation, options, message): def parallel_operation(containers, operation, options, message):