diff options
author | Matt Wrock <matt@mattwrock.com> | 2016-01-11 15:31:52 -0800 |
---|---|---|
committer | Matt Wrock <matt@mattwrock.com> | 2016-01-11 15:31:52 -0800 |
commit | b60bbc9a8d88f99fce913f63c629201f670fc43a (patch) | |
tree | 296992e25999e6140e1814792ebfa8ffffad9d0a /lib/chef/provider | |
parent | 0944320b72ee1ab16a18a149f5ecb743ace0c0d3 (diff) | |
download | chef-b60bbc9a8d88f99fce913f63c629201f670fc43a.tar.gz |
fexes #4354 and fiexs #4372 stop trying to auto detect versions for exe installersno_version_detect
Diffstat (limited to 'lib/chef/provider')
-rw-r--r-- | lib/chef/provider/package/windows/exe.rb | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/lib/chef/provider/package/windows/exe.rb b/lib/chef/provider/package/windows/exe.rb index 3758b8b1e2..8f6cd1efa5 100644 --- a/lib/chef/provider/package/windows/exe.rb +++ b/lib/chef/provider/package/windows/exe.rb @@ -48,7 +48,7 @@ class Chef end def package_version - new_resource.version || install_file_version + new_resource.version end def install_package @@ -97,18 +97,6 @@ class Chef end end - def install_file_version - @install_file_version ||= begin - if !new_resource.source.nil? && ::File.exist?(new_resource.source) - version_info = Chef::ReservedNames::Win32::File.version_info(new_resource.source) - file_version = version_info.FileVersion || version_info.ProductVersion - file_version == '' ? nil : file_version - else - nil - end - end - end - # http://unattended.sourceforge.net/installers.php def unattended_flags case installer_type |