diff options
Diffstat (limited to 'bin/puppetrun')
-rwxr-xr-x | bin/puppetrun | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/bin/puppetrun b/bin/puppetrun index d4af0abb6..30f1a043f 100755 --- a/bin/puppetrun +++ b/bin/puppetrun @@ -170,14 +170,6 @@ def setupldap end end -$haveusage = true - -begin - require 'rdoc/usage' -rescue Exception - $haveusage = false -end - flags = [ [ "--all", "-a", GetoptLong::NO_ARGUMENT ], [ "--class", "-c", GetoptLong::REQUIRED_ARGUMENT ], @@ -234,7 +226,7 @@ begin when "--host" hosts << arg when "--help" - if $haveusage + if Puppet.feature.usage? RDoc::usage && exit else puts "No help available unless you have RDoc::usage installed" @@ -257,9 +249,6 @@ begin } rescue GetoptLong::InvalidOption => detail $stderr.puts "Try '#{$0} --help'" - #if $haveusage - # RDoc::usage(1,'usage') - #end exit(1) end |