summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2014-06-25 20:27:18 -0700
committersersut <serdar@opscode.com>2014-06-25 22:13:01 -0700
commit5c68fa0077160677ab610a6fc6a8b07546a20440 (patch)
treeee4786454e19732288765f71b9b446d0d75a6f42
parent208427e10af5d95857cc7b2ddff252f2db631bbb (diff)
downloadchef-5c68fa0077160677ab610a6fc6a8b07546a20440.tar.gz
Only check WOW64 process when system architecture is x64.
Fixes https://github.com/opscode/chef/issues/1549
-rw-r--r--lib/chef/provider/windows_script.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/provider/windows_script.rb b/lib/chef/provider/windows_script.rb
index 04f9f9d023..efe0a81732 100644
--- a/lib/chef/provider/windows_script.rb
+++ b/lib/chef/provider/windows_script.rb
@@ -36,7 +36,7 @@ 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 ( 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