From 6de22518097a1195e793e07778e14891286b7fe8 Mon Sep 17 00:00:00 2001 From: Suyog Rao Date: Mon, 25 Apr 2016 22:54:44 -0700 Subject: [PATCH] Revert #5125 from 2.3 Some users may have scripted the download location, so I don't feel right in breaking this name in a minor version. This change should be documented as breaking, IMO --- rakelib/artifacts.rake | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/rakelib/artifacts.rake b/rakelib/artifacts.rake index a9a22ed30..a31b1266f 100644 --- a/rakelib/artifacts.rake +++ b/rakelib/artifacts.rake @@ -226,9 +226,6 @@ namespace "artifact" do case platform when "redhat", "centos" - # produce: logstash-5.0.0-alpha1.noarch.rpm - package_filename = "logstash-#{LOGSTASH_VERSION}.ARCH.TYPE" - File.join(basedir, "pkg", "logrotate.conf").tap do |path| dir.input("#{path}=/etc/logrotate.d/logstash") end @@ -248,9 +245,6 @@ namespace "artifact" do out.config_files << "etc/logrotate.d/logstash" out.config_files << "/etc/init.d/logstash" when "debian", "ubuntu" - # produce: logstash-5.0.0-alpha1_all.deb" - package_filename = "logstash-#{LOGSTASH_VERSION}_ARCH.TYPE" - File.join(basedir, "pkg", "logstash.default").tap do |path| dir.input("#{path}=/etc/default/logstash") end @@ -315,7 +309,7 @@ namespace "artifact" do out.attributes[:force?] = true # overwrite the rpm/deb/etc being created begin - path = File.join(basedir, "build", out.to_s(package_filename)) + path = File.join(basedir, "build", out.to_s) x = out.output(path) puts "Completed: #{path}" ensure