diff --git a/CHANGELOG.md b/CHANGELOG.md index d51f84c85..ceb695fdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ BUG FIXES: - On Windows, properly convert synced folder host path to a string so that separator replacement works properly. + - Use `--color=false` for no color in Puppet to support older + versions properly. [GH-2000] ## 1.2.6 (July 26, 2013) diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb index 2b5193b40..77302cb33 100644 --- a/plugins/provisioners/puppet/provisioner/puppet.rb +++ b/plugins/provisioners/puppet/provisioner/puppet.rb @@ -98,7 +98,7 @@ module VagrantPlugins end if !@machine.env.ui.is_a?(Vagrant::UI::Colored) - options << "--no-color" + options << "--color=false" end options << "--detailed-exitcodes" diff --git a/plugins/provisioners/puppet/provisioner/puppet_server.rb b/plugins/provisioners/puppet/provisioner/puppet_server.rb index 14ff66098..b374f9773 100644 --- a/plugins/provisioners/puppet/provisioner/puppet_server.rb +++ b/plugins/provisioners/puppet/provisioner/puppet_server.rb @@ -43,7 +43,7 @@ module VagrantPlugins # Disable colors if we must if !@machine.env.ui.is_a?(Vagrant::UI::Colored) - options << "--no-color" + options << "--color=false" end options = options.join(" ")