From 3b3463f5d24f64b4d3c99d929907862711f9249c Mon Sep 17 00:00:00 2001 From: Joe Rafaniello Date: Thu, 25 Jun 2015 17:29:00 -0400 Subject: [PATCH] Don't try to trap SIGKILL since it can't be trapped/ignored. Fixes `appliance_console.rb:105 in `trap': invalid argument - SIGKILL` Ruby 2.1 and earlier lets you trap SIGKILL even though it's useless. Ruby 2.2 won't let you try to trap it. See #2313 [skip ci] --- lib/appliance_console.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/appliance_console.rb b/lib/appliance_console.rb index 6142dd3c6ab..09cc939fdf5 100755 --- a/lib/appliance_console.rb +++ b/lib/appliance_console.rb @@ -102,7 +102,7 @@ def agree_with_timeout(*args, &block) require 'appliance_console/errors.rb' -[:INT, :TERM, :KILL, :ABRT, :TSTP].each { |s| trap(s) { raise MiqSignalError } } if LOCK_CONSOLE +[:INT, :TERM, :ABRT, :TSTP].each { |s| trap(s) { raise MiqSignalError } } if LOCK_CONSOLE # Disabled in order to allow rescue of timeout error HighLine.track_eof = false