From 6fb1090c8e3f6a8840406da4779f79514c58d0bd Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Wed, 24 Mar 2010 19:16:28 +0000 Subject: [PATCH] e.stderr may be None Review URL: http://codereview.chromium.org/1272003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@42505 0039d316-1c4b-4281-b951-d872f2087c98 --- trychange.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/trychange.py b/trychange.py index 85d589f0f..0f70130c3 100755 --- a/trychange.py +++ b/trychange.py @@ -372,8 +372,10 @@ def _SendChangeSVN(options): gclient_utils.CheckCall(["svn", "commit", full_path, '--file', temp_file.name], print_error=False) except gclient_utils.CheckCallError, e: - raise NoTryServerAccess(' '.join(e.command) + '\nOuput:\n' + - e.stdout + e.stderr) + out = e.stdout + if e.stderr: + out += e.stderr + raise NoTryServerAccess(' '.join(e.command) + '\nOuput:\n' + out) finally: temp_file.close() shutil.rmtree(temp_dir, True)