diff options
| author | Tim Smith <tsmith@chef.io> | 2018-07-23 15:49:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 15:49:28 -0700 |
| commit | 94c0844c99f9a8a0c173516daf3c346524e6d7ab (patch) | |
| tree | baf4ceafc71e7fd522eaefe52bf1a468c86cdf60 | |
| parent | b94ede6401acc708401101e3d0858b03b17125a8 (diff) | |
| parent | 54d3a967952bf96537167bd61d6a038c32940842 (diff) | |
| download | mixlib-shellout-94c0844c99f9a8a0c173516daf3c346524e6d7ab.tar.gz | |
Merge pull request #158 from MsysTechnologiesllc/dh/MSYS-847_fix_bare_rescues
Fix a bare rescue on Windows
| -rw-r--r-- | .rubocop.yml | 4 | ||||
| -rw-r--r-- | lib/mixlib/shellout/windows.rb | 4 | ||||
| -rw-r--r-- | mixlib-shellout-windows.gemspec | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 02e7511..489eaaa 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,9 +7,5 @@ Lint/UselessAccessModifier: Exclude: - 'lib/mixlib/shellout/windows/core_ext.rb' -# Set for mixlib-shell-out-windows.gemspec -Security/Eval: - Enabled: false - Style/HashSyntax: Enabled: true diff --git a/lib/mixlib/shellout/windows.rb b/lib/mixlib/shellout/windows.rb index da49d4a..07d3fbc 100644 --- a/lib/mixlib/shellout/windows.rb +++ b/lib/mixlib/shellout/windows.rb @@ -122,7 +122,7 @@ module Mixlib wmi = WmiLite::Wmi.new kill_process_tree(process.process_id, wmi, logger) Process.kill(:KILL, process.process_id) - rescue + rescue SystemCallError logger.warn("Failed to kill timed out process #{process.process_id}") if logger end @@ -357,7 +357,7 @@ module Mixlib ].join) end Process.kill(:KILL, instance.wmi_ole_object.processid) - rescue + rescue SystemCallError if logger logger.debug([ "Failed to kill child process #{child_pid}::", diff --git a/mixlib-shellout-windows.gemspec b/mixlib-shellout-windows.gemspec index bd3c21d..3a3968d 100644 --- a/mixlib-shellout-windows.gemspec +++ b/mixlib-shellout-windows.gemspec @@ -1,4 +1,4 @@ -gemspec = eval(File.read(File.expand_path("../mixlib-shellout.gemspec", __FILE__))) +gemspec = instance_eval(File.read(File.expand_path("../mixlib-shellout.gemspec", __FILE__))) gemspec.platform = Gem::Platform.new(%w{universal mingw32}) |