[arrow] branch master updated: ARROW-5146: [Dev] Fix project name inference in merge script

[ks...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 1ff1bca  ARROW-5146: [Dev] Fix project name inference in merge script
1ff1bca is described below

commit 1ff1bcada82b14cc3299b8562e320e6028696d2e
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Wed Apr 10 14:02:02 2019 +0200

    ARROW-5146: [Dev] Fix project name inference in merge script
    
    Author: Krisztián Szűcs <sz...@gmail.com>
    Author: Antoine Pitrou <an...@python.org>
    
    Closes #4129 from pitrou/ARROW-5146-merge-script-project-name and squashes the following commits:
    
    03001c1a3 <Krisztián Szűcs> remove default value
    f7505e327 <Antoine Pitrou> ARROW-5146:  Fix project name inference in merge script
---
 dev/merge_arrow_pr.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev/merge_arrow_pr.py b/dev/merge_arrow_pr.py
index 9332d49..6413365 100755
--- a/dev/merge_arrow_pr.py
+++ b/dev/merge_arrow_pr.py
@@ -378,9 +378,8 @@ class PullRequest(object):
 
 def cli():
     # Location of your Arrow git clone
-    SEP = os.path.sep
-    ARROW_HOME = os.path.abspath(__file__).rsplit(SEP, 2)[0]
-    PROJECT_NAME = ARROW_HOME.rsplit(SEP, 1)[1]
+    ARROW_HOME = os.path.abspath(os.path.dirname(__file__))
+    PROJECT_NAME = os.environ.get('ARROW_PROJECT_NAME') or 'arrow'
     print("ARROW_HOME = " + ARROW_HOME)
     print("PROJECT_NAME = " + PROJECT_NAME)