Merge pull request #19636 from d-m-u/fixing_requires_i_just_broke

Add back missing requires for rubyzip (cherry picked from commit 43306a5) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1783403
ManageIQ · Dec 13, 2019 · 642cc87 · 642cc87
1 parent fbeb6ea
commit 642cc87
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/lib/vmdb/util.rb b/lib/vmdb/util.rb
@@ -96,6 +96,7 @@ def self.log_duration_gz(filename)
     end
 
     def self.zip_logs(zip_filename, dirs, userid = "system")
+      require 'zip/filesystem'
       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
@@ -123,6 +123,8 @@ def self.assert_zip_entry_from_path(expected_entry, path)
   end
 
   context ".add_zip_entry(private)" do
+    require 'zip/filesystem'
+
     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 }