[arrow] 13/28: ARROW-8503: [Packaging][deb] Fix building apache-arrow-archive-keyring for RC

[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

commit d8de5790fce3c317db404153af4f103559cc6811
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Sat Apr 18 13:20:11 2020 +0900

    ARROW-8503: [Packaging][deb] Fix building apache-arrow-archive-keyring for RC
    
    Closes #6974 from kou/packaging-linux-rc
    
    Authored-by: Sutou Kouhei <ko...@clear-code.com>
    Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
 .../linux-packages/apache-arrow-archive-keyring/Rakefile  |  8 +++++++-
 dev/tasks/linux-packages/package-task.rb                  | 15 +++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/dev/tasks/linux-packages/apache-arrow-archive-keyring/Rakefile b/dev/tasks/linux-packages/apache-arrow-archive-keyring/Rakefile
index 35518c7..9c1ac97 100644
--- a/dev/tasks/linux-packages/apache-arrow-archive-keyring/Rakefile
+++ b/dev/tasks/linux-packages/apache-arrow-archive-keyring/Rakefile
@@ -44,7 +44,13 @@ class ApacheArrowArchiveKeyringPackageTask < PackageTask
 
     if deb_archive_name != @archive_name
       file deb_archive_name => @archive_name do
-        cp(@archive_name, deb_archive_name)
+        if @archive_base_name == deb_archive_base_name
+          cp(@archive_name, deb_archive_name)
+        else
+          sh("tar", "xf", @archive_name)
+          mv(@archive_base_name, deb_archive_base_name)
+          sh("tar", "czf", deb_archive_name, deb_archive_base_name)
+        end
       end
     end
   end
diff --git a/dev/tasks/linux-packages/package-task.rb b/dev/tasks/linux-packages/package-task.rb
index 1197b1b..ebe906e 100644
--- a/dev/tasks/linux-packages/package-task.rb
+++ b/dev/tasks/linux-packages/package-task.rb
@@ -39,15 +39,18 @@ class PackageTask
       type = $2
       if type == "rc" and options[:rc_build_type] == :release
         @deb_upstream_version = base_version
+        @deb_archive_base_name_version = base_version
         @rpm_version = base_version
         @rpm_release = "1"
       else
         @deb_upstream_version = "#{base_version}~#{sub_version}"
+        @deb_archive_base_name_version = @version
         @rpm_version = base_version
         @rpm_release = "0.#{sub_version}"
       end
     else
       @deb_upstream_version = @version
+      @deb_archive_base_name_version = @version
       @rpm_version = @version
       @rpm_release = "1"
     end
@@ -196,6 +199,10 @@ class PackageTask
     ]
   end
 
+  def deb_archive_base_name
+    "#{@package}-#{@deb_archive_base_name_version}"
+  end
+
   def deb_archive_name
     "#{@package}-#{@deb_upstream_version}.tar.gz"
   end
@@ -291,14 +298,14 @@ VERSION=#{@deb_upstream_version}
     ]
   end
 
-  def rpm_archive_name
-    "#{rpm_archive_base_name}.tar.gz"
-  end
-
   def rpm_archive_base_name
     "#{@package}-#{@rpm_version}"
   end
 
+  def rpm_archive_name
+    "#{rpm_archive_base_name}.tar.gz"
+  end
+
   def yum_dir
     "yum"
   end