diff options
Diffstat (limited to 'lib/puppet/application/doc.rb')
| -rw-r--r-- | lib/puppet/application/doc.rb | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb index 8dd116233..e4c247444 100644 --- a/lib/puppet/application/doc.rb +++ b/lib/puppet/application/doc.rb @@ -86,9 +86,7 @@ class Puppet::Application::Doc < Puppet::Application Puppet::Util::RDoc.rdoc(options[:outputdir], files, options[:charset]) end rescue => detail - if Puppet[:trace] - puts detail.backtrace - end + puts detail.backtrace if Puppet[:trace] $stderr.puts "Could not generate documentation: #{detail}" exit_code = 1 end @@ -99,9 +97,7 @@ class Puppet::Application::Doc < Puppet::Application require 'puppet/util/reference' options[:references].each do |name| section = Puppet::Util::Reference.reference(name) or raise "Could not find section #{name}" - unless options[:mode] == :pdf - section.trac - end + section.trac unless options[:mode] == :pdf end end @@ -154,9 +150,7 @@ class Puppet::Application::Doc < Puppet::Application end end - unless with_contents # We've only got one reference - text += Puppet::Util::Reference.footer - end + text += Puppet::Util::Reference.footer unless with_contents # We've only got one reference # Replace the trac links, since they're invalid everywhere else text.gsub!(/`\w+\s+([^`]+)`:trac:/) { |m| $1 } @@ -193,9 +187,7 @@ class Puppet::Application::Doc < Puppet::Application end end - if options[:references].empty? - options[:references] << :type - end + options[:references] << :type if options[:references].empty? end def setup_rdoc(dummy_argument=:work_arround_for_ruby_GC_bug) |