From fbeb6ea912703284827f619c3533bfa4a5fc449d Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Thu, 12 Dec 2019 11:25:42 -0500 Subject: [PATCH] Merge pull request #19629 from d-m-u/updating_rubyzip_again Update rubyzip to 2.0.0 (cherry picked from commit bc83fb6a2ce1d3bddd29098fe50114bddadb3bcd) https://bugzilla.redhat.com/show_bug.cgi?id=1783403 --- Gemfile | 2 +- lib/vmdb/util.rb | 5 ----- spec/lib/vmdb/util_spec.rb | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 2b6708af3c8..b862f03b72b 100644 --- a/Gemfile +++ b/Gemfile @@ -62,7 +62,7 @@ gem "rake", ">=11.0", :require => false gem "rest-client", "~>2.0.0", :require => false gem "ripper_ruby_parser", "~>1.2.0", :require => false gem "ruby-progressbar", "~>1.7.0", :require => false -gem "rubyzip", "~>1.3.0", :require => false +gem "rubyzip", "~>2.0.0", :require => false gem "rugged", "~>0.27.0", :require => false gem "simple-rss", "~>1.3.1", :require => false gem "snmp", "~>1.2.0", :require => false diff --git a/lib/vmdb/util.rb b/lib/vmdb/util.rb index 4528b82f73c..67ee1dbc07d 100644 --- a/lib/vmdb/util.rb +++ b/lib/vmdb/util.rb @@ -96,11 +96,6 @@ def self.log_duration_gz(filename) end def self.zip_logs(zip_filename, dirs, userid = "system") - require 'zip/filesystem' - # we need to set this flag to true until we can upgrade to rubyzip 2.0.0 - # see https://github.com/rubyzip/rubyzip/pull/403#issue-317103816 - Zip.validate_entry_sizes = true - zip_dir = Rails.root.join("data", "user", userid) FileUtils.mkdir_p(zip_dir) unless File.exist?(zip_dir) diff --git a/spec/lib/vmdb/util_spec.rb b/spec/lib/vmdb/util_spec.rb index 7b7871e5964..c630b75ee2b 100644 --- a/spec/lib/vmdb/util_spec.rb +++ b/spec/lib/vmdb/util_spec.rb @@ -123,11 +123,6 @@ def self.assert_zip_entry_from_path(expected_entry, path) end context ".add_zip_entry(private)" do - require 'zip/filesystem' - # we need to set this flag to true until we can upgrade to rubyzip 2.0.0 - # see https://github.com/rubyzip/rubyzip/pull/403#issue-317103816 - Zip.validate_entry_sizes = true - let(:origin_file) { Tempfile.new 'origin' } let(:symlink_level_1) { create_temp_symlink 'symlink_level_1', origin_file.path } let(:symlink_level_2) { create_temp_symlink 'symlink_level_2', symlink_level_1 }