summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-05-12 18:25:14 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commitac7efc8f0284d6b35f5428da06ba371cf94998ec (patch)
treec1a6a6df5dd2d533c1d0b12b869a0758b8c4cb6f /lib/puppet/application
parent5665e3984f73c70b90f65dd8bf4445b5adda5121 (diff)
downloadpuppet-ac7efc8f0284d6b35f5428da06ba371cf94998ec.tar.gz
puppet-ac7efc8f0284d6b35f5428da06ba371cf94998ec.tar.xz
puppet-ac7efc8f0284d6b35f5428da06ba371cf94998ec.zip
Feature #2935 Puppet::Mode#master?
Use a predicate function on the Mode object instead of comparing with the executable name everywhere Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'lib/puppet/application')
-rw-r--r--lib/puppet/application/doc.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb
index 0f4381f4b..5da7040ae 100644
--- a/lib/puppet/application/doc.rb
+++ b/lib/puppet/application/doc.rb
@@ -207,8 +207,6 @@ class Puppet::Application::Doc < Puppet::Application
end
end
- # hack to get access to puppetmasterd modulepath and manifestdir
- Puppet[:name] = "puppetmasterd"
# Now parse the config
Puppet.parse_config