From: Sage Weil <sage@newdream.net>
Date: Fri, 26 Feb 2021 23:16:59 +0000 (-0600)
Subject: asdf
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bcb40bb0c35497b4ebecf4fda19bf119af62b781;p=teuthology.git

asdf
---

diff --git a/teuthology/orchestra/run.py b/teuthology/orchestra/run.py
index aea3c8b7f..7647e04b3 100644
--- a/teuthology/orchestra/run.py
+++ b/teuthology/orchestra/run.py
@@ -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)