diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2010-10-16 19:10:43 +0200 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-11-10 06:19:46 +1100 |
| commit | 06c8748cbfed67b2440e11577a52f60c43277217 (patch) | |
| tree | 811b0115c829dc2b2e61f977092c31dde60d854f /lib/puppet | |
| parent | 6e6712b543949bc5bb98e63cfdf4112c79adc28c (diff) | |
| download | puppet-06c8748cbfed67b2440e11577a52f60c43277217.tar.gz puppet-06c8748cbfed67b2440e11577a52f60c43277217.tar.xz puppet-06c8748cbfed67b2440e11577a52f60c43277217.zip | |
Fix #3808 - puppetdoc should use --force-update only if RDoc supports it
This should allow to run puppetdoc on ruby 1.8.5.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/util/rdoc.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/puppet/util/rdoc.rb b/lib/puppet/util/rdoc.rb index 085d8ec93..bdac579d6 100644 --- a/lib/puppet/util/rdoc.rb +++ b/lib/puppet/util/rdoc.rb @@ -10,24 +10,25 @@ module Puppet::Util::RDoc # then rdoc require 'rdoc/rdoc' + require 'rdoc/options' # load our parser require 'puppet/util/rdoc/parser' r = RDoc::RDoc.new - RDoc::RDoc::GENERATORS["puppet"] = RDoc::RDoc::Generator.new( + RDoc::RDoc::GENERATORS["puppet"] = RDoc::RDoc::Generator.new( "puppet/util/rdoc/generators/puppet_generator.rb", - "PuppetGenerator".intern, + "PuppetGenerator".intern, + "puppet") - "puppet") # specify our own format & where to output options = [ "--fmt", "puppet", "--quiet", - "--force-update", "--exclude", "/modules/[^/]*/files/.*\.pp$", "--op", outputdir ] + options << "--force-update" if Options::OptionList.options.any? { |o| o[0] == "--force-update" } options += [ "--charset", charset] if charset options += files |