[arrow] branch master updated: [Packaging] Fix fallback value code in Ruby

[kou]

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

kou 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 bce0ca4  [Packaging] Fix fallback value code in Ruby
bce0ca4 is described below

commit bce0ca40922278644ce9c610fc87c0761a95f2c4
Author: Kouhei Sutou <k...@clear-code.com>
AuthorDate: Wed Jul 11 09:19:21 2018 +0900

    [Packaging] Fix fallback value code in Ruby
    
    We should use "||" for this case. "or" has lower priority in Ruby.
    
        a = b or c
    
    means
    
        (a = b) or c
    
    not
    
        a = (b or c)
---
 dev/tasks/linux-packages/Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tasks/linux-packages/Rakefile 
b/dev/tasks/linux-packages/Rakefile
index 0bcf5b5..16b61bf 100644
--- a/dev/tasks/linux-packages/Rakefile
+++ b/dev/tasks/linux-packages/Rakefile
@@ -34,7 +34,7 @@ class ApacheArrowPackageTask < PackageTask
   def detect_version(release_time)
     pom_xml_path = File.join(arrow_source_dir, "java", "pom.xml")
     version = File.read(pom_xml_path).scan(/^  
<version>(.+?)<\/version>/)[0][0]
-    version = ENV['ARROW_VERSION'] or version  #try to read from env
+    version = ENV['ARROW_VERSION'] || version  #try to read from env
     formatted_release_time = release_time.strftime("%Y%m%d")
     version.gsub(/-SNAPSHOT\z/) {".#{formatted_release_time}"}
   end