Blob Blame History Raw
From ce6cd3ae9dc89dd1de5122add016ce2df60b6cee Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Mon, 19 Jan 2015 21:40:27 +0000
Subject: [PATCH 46/93] [docker] use splitelines() for command output

Let's not reinvent splitlines(); the handrolled version docker
was using fails to ignore the last newline:

[plugin:docker] collecting output of 'docker logs 9b8f61c09dba'
[plugin:docker] collecting output of 'docker logs 6f46267c91d6'
[plugin:docker] collecting output of 'docker logs '

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
 sos/plugins/docker.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py
index d8851a0..ef4ede0 100644
--- a/sos/plugins/docker.py
+++ b/sos/plugins/docker.py
@@ -45,8 +45,7 @@ class Docker(Plugin):
 
         result = self.get_command_output(ps_cmd)
         if result['status'] == 0:
-            result['output'] = result['output'].split("\n")
-            for line in result['output'][1:]:
+            for line in result['output'].splitlines()[1:]:
                 container_id = line.split(" ")[0]
                 self.add_cmd_output([
                     "{0} logs {1}".format(self.docker_bin, container_id)
-- 
1.9.3