Merge pull request #437 from onetop21/dev

update 0.4.7
onetop21 · Jul 4, 2022 · af02871 · af02871
2 parents 31cd6ab + 97c659a
commit af02871
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/python/mlad/__init__.py b/python/mlad/__init__.py
@@ -1 +1 @@
-__version__ = '0.4.6'
+__version__ = '0.4.7'
diff --git a/python/mlad/cli/project.py b/python/mlad/cli/project.py
@@ -844,7 +844,8 @@ def _format_log(log, colorkey=None, max_name_width=32, pretty=True):
     else:
         colorkey = defaultdict(lambda: '')
     if '\r' in msg:
-        msg = msg.split('\r')[-1] + '\n'
+        msg_list = msg.split('\r')
+        msg = msg_list[-2] if msg.endswith('\r\n') else msg_list[-1]
     if msg.endswith('\n'):
         msg = msg[:-1]
     if timestamp is not None:

diff --git a/python/mlad/core/docker/controller.py b/python/mlad/core/docker/controller.py
@@ -100,7 +100,7 @@ def _request_build(headers, params, tar):
         import requests_unixsocket
         with requests_unixsocket.post(f"{host}/v1.24/build", headers=headers, params=params, data=tar, stream=True) as resp:
             for _ in resp.iter_lines(decode_unicode=True):
-                line = json.loads(_)
+                line = json.loads(_ or '{}')
                 yield line
     if stream:
         return _request_build(headers, params, tar)