github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "always use JARS_SKIP when installing or updating plugins"

Browse source 
This reverts commit 628207e96c.

Fixes #8070
This commit is contained in:
Jake Landis 2017-08-24 18:42:40 -05:00
parent 2d44997a77
commit b982a1ecbe
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pluginmanager/install.rb
View file

@ -20,9 +20,8 @@ class LogStash::PluginManager::Install < LogStash::PluginManager::Command
# but the argument parsing does not support it for now so currently if specifying --version only
# one plugin name can be also specified.
def execute
# we never want to lookup jars or touch the ~/.m2 directory
# all plugins that use gems ship them inside the .gem
ENV["JARS_SKIP"] = "true"
# Turn off any jar dependencies lookup when running with `--local`
ENV["JARS_SKIP"] = "true" if local?
# This is a special flow for PACK related plugins,
# if we dont detect an pack we will just use the normal `Bundle install` Strategy`

3
lib/pluginmanager/update.rb
View file

@ -14,7 +14,8 @@ class LogStash::PluginManager::Update < LogStash::PluginManager::Command
option "--local", :flag, "force local-only plugin update. see bin/logstash-plugin package|unpack", :default => false
def execute
ENV["JARS_SKIP"] = "true"
# Turn off any jar dependencies lookup when running with `--local`
ENV["JARS_SKIP"] = "true" if local?
# remove "system" local gems used by LS
local_gems = gemfile.locally_installed_gems.map(&:name) - NON_PLUGIN_LOCAL_GEMS