diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-11-08 05:22:24 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-11-08 05:22:24 +0000 |
| commit | 744ded30a02883dd8ce5fbf2b847f10acb226d6e (patch) | |
| tree | d962b7b21f3a5d20dafd8e7f862c23a2449c2c9b /bin/puppetdoc | |
| parent | dc4d98091a5566be289830839f1d6eb39367b42c (diff) | |
| download | puppet-744ded30a02883dd8ce5fbf2b847f10acb226d6e.tar.gz puppet-744ded30a02883dd8ce5fbf2b847f10acb226d6e.tar.xz puppet-744ded30a02883dd8ce5fbf2b847f10acb226d6e.zip | |
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
Diffstat (limited to 'bin/puppetdoc')
| -rwxr-xr-x | bin/puppetdoc | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/bin/puppetdoc b/bin/puppetdoc index c857f6c49..9929edee5 100755 --- a/bin/puppetdoc +++ b/bin/puppetdoc @@ -44,14 +44,6 @@ require 'puppet' require 'getoptlong' -$haveusage = true - -begin - require 'rdoc/usage' -rescue Exception - $haveusage = false -end - result = GetoptLong.new( [ "--arguments", "-a", GetoptLong::NO_ARGUMENT ], [ "--types", "-t", GetoptLong::NO_ARGUMENT ], @@ -72,7 +64,7 @@ begin when "--types" mode = :types when "--help" - if $haveusage + if Puppet.feature.usage? RDoc::usage && exit else puts "No help available unless you have RDoc::usage installed" @@ -82,9 +74,6 @@ begin } rescue GetoptLong::InvalidOption => detail $stderr.puts "Try '#{$0} --help'" - #if $haveusage - # RDoc::usage_no_exit('usage') - #end exit(1) end |