]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
asdf
authorSage Weil <sage@newdream.net>
Fri, 26 Feb 2021 23:16:59 +0000 (17:16 -0600)
committerSage Weil <sage@newdream.net>
Fri, 26 Feb 2021 23:16:59 +0000 (17:16 -0600)
teuthology/orchestra/run.py

index aea3c8b7fbab92d47ac3da383b9638efb6540dad..7647e04b313944da0b60434963411b64063433ac 100644 (file)
@@ -292,8 +292,8 @@ def copy_to_log(f, logger, loglevel=logging.INFO, capture=None, quiet=False):
         try:
             if isinstance(line, bytes):
                 line = line.decode('utf-8', 'replace')
+            segments = line.replace('\r', '\n').split('\n')
             logger.log(loglevel, f">>>segments = {segments}")
-            segments = line.split('\n')
             next_partial = segments.pop(-1)
             for s in segments:
                 logger.log(loglevel, partial + s)