Repository: spark Updated Branches: refs/heads/master 1b97a941a -> e222221e2
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 <pwend...@gmail.com> Closes #2645 from pwendell/merge-script and squashes the following commits: 167b792 [Patrick Wendell] HOTFIX: Fix unicode error in merge script. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e222221e Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e222221e Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e222221e Branch: refs/heads/master Commit: e222221e24c122300bbde6d5ec4002a7c42b2e24 Parents: 1b97a94 Author: Patrick Wendell <pwend...@gmail.com> Authored: Sun Oct 5 13:22:40 2014 -0700 Committer: Patrick Wendell <pwend...@gmail.com> Committed: Sun Oct 5 13:22:40 2014 -0700 ---------------------------------------------------------------------- dev/merge_spark_pr.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/e222221e/dev/merge_spark_pr.py ---------------------------------------------------------------------- diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index a8e92e3..02ac209 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(" ")) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
