x/solar
Code Issues Proposed changes

Merge "Ansible returns error on stdout"

Browse Source
This commit is contained in:
Jenkins 2016-02-11 15:51:04 +00:00 committed by Gerrit Code Review
commit caf8688d72
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
solar/core/transports/base.py
View File

@ -81,7 +81,10 @@ class SolarTransportResult(object):
def output(self): def output(self):
if self.success: if self.success:
return self.stdout return self.stdout
return self.stderr msg = self.stderr
if not msg:
msg = self.stdout
return msg
@classmethod @classmethod
def from_tuple(cls, return_code, stdout, stderr): def from_tuple(cls, return_code, stdout, stderr):