diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-10-05 13:22:40 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-10-05 13:22:40 -0700 |
| commit | e222221e24c122300bbde6d5ec4002a7c42b2e24 (patch) | |
| tree | 2420f879b6766ab4eb59cfd9b7aacaa53cbc041f /dev/merge_spark_pr.py | |
| parent | 1b97a941a09a2f63d442f435c1b444d857cd6956 (diff) | |
| download | spark-e222221e24c122300bbde6d5ec4002a7c42b2e24.tar.gz spark-e222221e24c122300bbde6d5ec4002a7c42b2e24.tar.bz2 spark-e222221e24c122300bbde6d5ec4002a7c42b2e24.zip | |
HOTFIX: Fix unicode error in merge script.
The merge script builds up a big command array and sometimes
this contains both unicode and ascii strings. This doesn't work
if you try to join them into a single string. Longer term a solution
is to go and make sure the source of all strings is unicode.
This patch provides a simpler solution... just print the array
rather than joining. I actually prefer printing an array here
anyways since joining on spaces is lossy in the case of arguments
that themselves contain spaces.
Author: Patrick Wendell <pwendell@gmail.com>
Closes #2645 from pwendell/merge-script and squashes the following commits:
167b792 [Patrick Wendell] HOTFIX: Fix unicode error in merge script.
Diffstat (limited to 'dev/merge_spark_pr.py')
| -rwxr-xr-x | dev/merge_spark_pr.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index a8e92e36fe..02ac20984a 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -73,11 +73,10 @@ def fail(msg): def run_cmd(cmd): + print cmd if isinstance(cmd, list): - print " ".join(cmd) return subprocess.check_output(cmd) else: - print cmd return subprocess.check_output(cmd.split(" ")) |