Fixing module_puppet to use the usage? feature.

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

1 files changed, 4 insertions, 12 deletions

diff --git a/ext/module_puppet b/ext/module_puppet
index 458f698fc..0ae2ecc30 100755
--- a/ext/module_puppet
+++ b/ext/module_puppet
@@ -51,14 +51,6 @@ require 'puppet/server'
 require 'puppet/client'
 require 'getoptlong'
 
-$haveusage = true
-
-begin
-    require 'rdoc/usage'
-rescue LoadError
-    $haveusage = false
-end
-
 options = [
     [ "--debug",	"-d",			GetoptLong::NO_ARGUMENT ],
     [ "--help",		"-h",			GetoptLong::NO_ARGUMENT ],
@@ -92,7 +84,7 @@ begin
                 puts "%s" % Puppet.version
                 exit
             when "--help"
-                if $haveusage
+                if Puppet.features.usage?
                     RDoc::usage && exit
                 else
                     puts "No help available unless you have RDoc::usage installed"
@@ -121,9 +113,9 @@ begin
     }
 rescue GetoptLong::InvalidOption => detail
     $stderr.puts "Try '#{$0} --help'"
-    #if $haveusage
-    #    RDoc::usage(1,'usage')
-    #end
+    if Puppet.features.usage?
+        RDoc::usage(1,'usage')
+    end
     exit(1)
 end