Skip to content

Commit e222221

Browse files
committed
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 <[email protected]> Closes #2645 from pwendell/merge-script and squashes the following commits: 167b792 [Patrick Wendell] HOTFIX: Fix unicode error in merge script.
1 parent 1b97a94 commit e222221

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

dev/merge_spark_pr.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,10 @@ def fail(msg):
7373

7474

7575
def run_cmd(cmd):
76+
print cmd
7677
if isinstance(cmd, list):
77-
print " ".join(cmd)
7878
return subprocess.check_output(cmd)
7979
else:
80-
print cmd
8180
return subprocess.check_output(cmd.split(" "))
8281

8382

0 commit comments

Comments
 (0)