Skip to content

Commit

Permalink
Merge pull request #242 from dafyddcrosby/runcommand_rm_187
Browse files Browse the repository at this point in the history
[Unix#run_command] Remove Ruby 1.8.7 check
  • Loading branch information
tpowell-progress authored Jun 18, 2024
2 parents f2eeefb + 5e9ddd4 commit 14ff6a4
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions lib/mixlib/shellout/unix.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ module Mixlib
class ShellOut
module Unix

# "1.8.7" as a frozen string. We use this with a hack that disables GC to
# avoid segfaults on Ruby 1.8.7, so we need to allocate the fewest
# objects we possibly can.
ONE_DOT_EIGHT_DOT_SEVEN = "1.8.7".freeze

# Option validation that is unix specific
def validate_options(opts)
if opts[:elevated]
Expand Down Expand Up @@ -99,12 +94,6 @@ def run_command

configure_parent_process_file_descriptors

# Ruby 1.8.7 and 1.8.6 from mid 2009 try to allocate objects during GC
# when calling IO.select and IO#read. Disabling GC works around the
# segfault, but obviously it's a bad workaround. We no longer support
# 1.8.6 so we only need this hack for 1.8.7.
GC.disable if RUBY_VERSION == ONE_DOT_EIGHT_DOT_SEVEN

# CHEF-3390: Marshall.load on Ruby < 1.8.7p369 also has a GC bug related
# to Marshall.load, so try disabling GC first.
propagate_pre_exec_failure
Expand Down

0 comments on commit 14ff6a4

Please sign in to comment.