diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2019-07-02 15:09:07 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2019-07-02 15:09:07 -0700 |
| commit | 7a1a6c8ef26c787e4b6dd1602f3d158b37e81720 (patch) | |
| tree | 1e390cd535b38368d091cbb33e5d419408d5ce00 /lib/chef/resource/windows_feature_powershell.rb | |
| parent | 77f8739a4741e2370e40ec39345a92a6ea393a1a (diff) | |
| download | chef-7a1a6c8ef26c787e4b6dd1602f3d158b37e81720.tar.gz | |
fix Layout/EmptyLineAfterGuardClause
i like this one, gives visual priority to returns or raises that are
buried in the middle of things.
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/resource/windows_feature_powershell.rb')
| -rw-r--r-- | lib/chef/resource/windows_feature_powershell.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/chef/resource/windows_feature_powershell.rb b/lib/chef/resource/windows_feature_powershell.rb index 6806c92fb9..908bb96c76 100644 --- a/lib/chef/resource/windows_feature_powershell.rb +++ b/lib/chef/resource/windows_feature_powershell.rb @@ -132,6 +132,7 @@ class Chef def powershell_version cmd = powershell_out("$PSVersionTable.psversion.major") return 1 if cmd.stdout.empty? # PowerShell 1.0 doesn't have a $PSVersionTable + Regexp.last_match(1).to_i if cmd.stdout =~ /^(\d+)/ rescue Errno::ENOENT 0 # zero as in nothing is installed @@ -245,6 +246,7 @@ class Chef # @return [void] def fail_if_removed return if new_resource.source # if someone provides a source then all is well + if node["platform_version"].to_f > 6.2 # 2012R2 or later return if registry_key_exists?('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing') && registry_value_exists?('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Servicing', name: "LocalSourcePath") # if source is defined in the registry, still fine end |