You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2017/04/06 22:49:09 UTC
arrow git commit: ARROW-778: Port merge tool to work on Windows
Repository: arrow
Updated Branches:
refs/heads/master e371ebd7e -> e53357cd6
ARROW-778: Port merge tool to work on Windows
Author: Wes McKinney <we...@twosigma.com>
Closes #501 from wesm/ARROW-778 and squashes the following commits:
a554320 [Wes McKinney] Use os.path.sep for splitting paths
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/e53357cd
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/e53357cd
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/e53357cd
Branch: refs/heads/master
Commit: e53357cd610f1bdca0cbbac001e417f329d54be1
Parents: e371ebd
Author: Wes McKinney <we...@twosigma.com>
Authored: Thu Apr 6 18:49:06 2017 -0400
Committer: Wes McKinney <we...@twosigma.com>
Committed: Thu Apr 6 18:49:06 2017 -0400
----------------------------------------------------------------------
dev/merge_arrow_pr.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/e53357cd/dev/merge_arrow_pr.py
----------------------------------------------------------------------
diff --git a/dev/merge_arrow_pr.py b/dev/merge_arrow_pr.py
index 39db254..99ccc43 100755
--- a/dev/merge_arrow_pr.py
+++ b/dev/merge_arrow_pr.py
@@ -42,8 +42,9 @@ except ImportError:
JIRA_IMPORTED = False
# Location of your Arrow git clone
-ARROW_HOME = os.path.abspath(__file__).rsplit("/", 2)[0]
-PROJECT_NAME = ARROW_HOME.rsplit("/", 1)[1]
+SEP = os.path.sep
+ARROW_HOME = os.path.abspath(__file__).rsplit(SEP, 2)[0]
+PROJECT_NAME = ARROW_HOME.rsplit(SEP, 1)[1]
print("ARROW_HOME = " + ARROW_HOME)
print("PROJECT_NAME = " + PROJECT_NAME)