diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2020-03-04 16:49:48 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2020-03-04 16:49:48 -0800 |
| commit | cc792527ad9d8222b3a0990e70f2d59f86f074ae (patch) | |
| tree | 88e5cc171b7957f7a6331bacda748a4ca6dd628f | |
| parent | 633c4445e00f3174d156ac69a05be117a3fd0456 (diff) | |
| download | chef-cc792527ad9d8222b3a0990e70f2d59f86f074ae.tar.gz | |
fixing some windows func test breaks
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | lib/chef/provider.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/batch.rb | 2 | ||||
| -rw-r--r-- | lib/chef/provider/powershell_script.rb | 4 | ||||
| -rw-r--r-- | lib/chef/provider/windows_script.rb | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb index 06e0341089..07cdea6dfc 100644 --- a/lib/chef/provider.rb +++ b/lib/chef/provider.rb @@ -63,7 +63,7 @@ class Chef # # @return [void] def self.action(name, &block) - # We need the block directly in a method so that `super` works. + # We need the block directly in a method so that `return` works. define_method("compile_action_#{name}", &block) class_eval <<-EOM def action_#{name} diff --git a/lib/chef/provider/batch.rb b/lib/chef/provider/batch.rb index 21dc8f84dd..00593707e7 100644 --- a/lib/chef/provider/batch.rb +++ b/lib/chef/provider/batch.rb @@ -1,6 +1,6 @@ # # Author:: Adam Edwards (<adamed@chef.io>) -# Copyright:: Copyright 2013-2016, Chef Software Inc. +# Copyright:: Copyright 2013-2020, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/chef/provider/powershell_script.rb b/lib/chef/provider/powershell_script.rb index f7979ca6f5..00cc450253 100644 --- a/lib/chef/provider/powershell_script.rb +++ b/lib/chef/provider/powershell_script.rb @@ -1,6 +1,6 @@ # # Author:: Adam Edwards (<adamed@chef.io>) -# Copyright:: Copyright 2013-2016, Chef Software Inc. +# Copyright:: Copyright 2013-2020, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,7 +32,7 @@ class Chef action :run do validate_script_syntax! - super + super() end def command diff --git a/lib/chef/provider/windows_script.rb b/lib/chef/provider/windows_script.rb index c4ea244ea1..4325236607 100644 --- a/lib/chef/provider/windows_script.rb +++ b/lib/chef/provider/windows_script.rb @@ -1,6 +1,6 @@ # # Author:: Adam Edwards (<adamed@chef.io>) -# Copyright:: Copyright 2013-2016, Chef Software Inc. +# Copyright:: Copyright 2013-2020, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -54,7 +54,7 @@ class Chef end begin - super + super() rescue raise ensure |