Merging the code over from the oscar branch. I will now be doing all development in the trunk again, except for larger changes, which will still get their own branch. This is a merge of the changes from revision 1826 to revision 1834.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1835 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 1 insertions, 13 deletions

diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index 2bf018b55..ec47075f8 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -103,14 +103,6 @@ Puppet.config.addargs(options)
 
 result = GetoptLong.new(*options)
 
-$haveusage = true
-
-begin
-    require 'rdoc/usage'
-rescue Exception
-    $haveusage = false
-end
-
 master = {}
 ca = {}
 report = {}
@@ -136,7 +128,7 @@ begin
             when "--debug"
                 options[:debug] = true
             when "--help"
-                if $haveusage
+                if Puppet.feature.usage?
                     RDoc::usage && exit
                 else
                     puts "No help available unless you have RDoc::usage installed"
@@ -174,10 +166,6 @@ begin
 rescue GetoptLong::InvalidOption => detail
     $stderr.puts "Try '#{$0} --help'"
     #$stderr.puts detail
-    # FIXME RDoc::usage doesn't seem to work
-    #if $haveusage
-    #    RDoc::usage(1,'usage')
-    #end
     exit(1)
 end