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, 12 deletions

diff --git a/bin/puppet b/bin/puppet
index 3148cbd50..9421e30f5 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -64,14 +64,6 @@ require 'puppet/server'
 require 'puppet/client'
 require 'getoptlong'
 
-$haveusage = true
-
-begin
-    require 'rdoc/usage'
-rescue Exception
-    $haveusage = false
-end
-
 options = [
     [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
     [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
@@ -108,7 +100,7 @@ begin
                 puts "%s" % Puppet.version
                 exit
             when "--help"
-                if $haveusage
+                if Puppet.feature.usage?
                     RDoc::usage && exit
                 else
                     puts "No help available unless you have RDoc::usage installed"
@@ -137,9 +129,6 @@ begin
     }
 rescue GetoptLong::InvalidOption => detail
     $stderr.puts "Try '#{$0} --help'"
-    #if $haveusage
-    #    RDoc::usage(1,'usage')
-    #end
     exit(1)
 end