YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/unstable' into unstable

Browse source
This commit is contained in:
Weblate 2015-11-15 14:58:44 +01:00
commit 2ffd248e7b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/yunohost
View file

@ -95,7 +95,7 @@ def _init_moulinette(debug=False, verbose=False, quiet=False):
elif verbose and 'tty' not in handlers: elif verbose and 'tty' not in handlers:
handlers.append('tty') handlers.append('tty')
root_handlers = handlers root_handlers = set(handlers)
if not debug: if not debug:
root_handlers.remove('tty') root_handlers.remove('tty')

2
src/yunohost/hook.py
View file

@ -386,7 +386,7 @@ def hook_exec(path, args=None, raise_on_error=False, no_trace=False):
# Wrap and get process outputs # Wrap and get process outputs
stdout_reader, stdout_queue = start_async_file_reading(process.stdout) stdout_reader, stdout_queue = start_async_file_reading(process.stdout)
stderr_reader, stderr_queue = start_async_file_reading(process.stderr) stderr_reader, stderr_queue = start_async_file_reading(process.stderr)
while not stdout_reader.eof() or not stderr_reader.eof(): while not stdout_reader.eof() and not stderr_reader.eof():
while not stdout_queue.empty(): while not stdout_queue.empty():
line = stdout_queue.get() line = stdout_queue.get()
logger.info(line.rstrip()) logger.info(line.rstrip())