Merge "replaced e.message"

This commit is contained in:
Jenkins 2014-05-23 10:04:53 +00:00 committed by Gerrit Code Review
commit 89d0b0f510
1 changed files with 1 additions and 1 deletions

View File

@ -627,7 +627,7 @@ def main():
sys.exit(130)
except Exception as e:
logger.debug(e, exc_info=1)
message = e.message
message = six.text_type(e)
if not isinstance(message, six.string_types):
message = str(message)
print("ERROR: %s" % strutils.safe_encode(message), file=sys.stderr)