diff options
| author | Serdar Sutay <serdar@opscode.com> | 2014-06-26 15:27:06 -0700 |
|---|---|---|
| committer | Serdar Sutay <serdar@opscode.com> | 2014-06-26 15:27:06 -0700 |
| commit | 64c7f8fe69dbfe7ed73fdcfaf97d712b778ca6ae (patch) | |
| tree | 91f24add922cc8a266faac08b57af0a8feb043fb | |
| parent | e3478c453114cda28e538e2375d91630d7dd5fa4 (diff) | |
| parent | 40abdbc9486980be9889144d1e94225dc89e81e7 (diff) | |
| download | chef-64c7f8fe69dbfe7ed73fdcfaf97d712b778ca6ae.tar.gz | |
Merge pull request #1560 from opscode/sersut/chef-1549
Only check WOW64 process when system architecture is x64.
| -rw-r--r-- | lib/chef/provider/windows_script.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/provider/windows_script.rb b/lib/chef/provider/windows_script.rb index 04f9f9d023..e600bb2837 100644 --- a/lib/chef/provider/windows_script.rb +++ b/lib/chef/provider/windows_script.rb @@ -36,7 +36,8 @@ class Chef @is_wow64 = wow64_architecture_override_required?(run_context.node, target_architecture) - if ( target_architecture == :i386 ) && ! is_i386_process_on_x86_64_windows? + # if the user wants to run the script 32 bit && we are on a 64bit windows system && we are running a 64bit ruby ==> fail + if ( target_architecture == :i386 ) && node_windows_architecture(run_context.node) == :x86_64 && !is_i386_process_on_x86_64_windows? raise Chef::Exceptions::Win32ArchitectureIncorrect, "Support for the i386 architecture from a 64-bit Ruby runtime is not yet implemented" end |