summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJacob Helwig <jacob@puppetlabs.com>2011-07-08 11:25:03 -0700
committerJacob Helwig <jacob@puppetlabs.com>2011-07-08 13:36:47 -0700
commit3a70503b60f9fd51177df4e9267c5ac28b06fb2d (patch)
tree59681a2cd5029d923b94d7fa24d407ec549ed205 /lib
parent3cc09811cae1b263c0f94c78619b9e195c3d6bf9 (diff)
downloadpuppet-3a70503b60f9fd51177df4e9267c5ac28b06fb2d.tar.gz
puppet-3a70503b60f9fd51177df4e9267c5ac28b06fb2d.tar.xz
puppet-3a70503b60f9fd51177df4e9267c5ac28b06fb2d.zip
Disable the master on Windows instead of blowing up with failed resources
Running the Puppet master on Windows is not supported, so instead of failing with what can be cryptic error messages about failed resources we fail with an explicit error message about the master on Windows not being supported. This way a user isn't mistakenly given the impression that running a master on Windows will work, and they just have something mis-configured. Signed-off-by: Jacob Helwig <jacob@puppetlabs.com> Reviewed-by: Max Martin <max@puppetlabs.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/application/master.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/application/master.rb b/lib/puppet/application/master.rb
index 18425c8bc..b4da770f0 100644
--- a/lib/puppet/application/master.rb
+++ b/lib/puppet/application/master.rb
@@ -206,6 +206,8 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
end
def setup
+ raise Puppet::Error.new("Puppet master is not supported on Microsoft Windows") if Puppet.features.microsoft_windows?
+
# Handle the logging settings.
if options[:debug] or options[:verbose]
if options[:debug]