diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-04-13 16:57:11 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-04-13 16:57:11 -0700 |
| commit | 5915814c47649bb4b957b4be4fcee5919b859451 (patch) | |
| tree | 3c977fddfcfe7dd074682d62d44e919f450c3769 /lib/puppet/util | |
| parent | 24a277c5e805ce16e0b86e17e6cb2fbe1945ae07 (diff) | |
| download | puppet-5915814c47649bb4b957b4be4fcee5919b859451.tar.gz puppet-5915814c47649bb4b957b4be4fcee5919b859451.tar.xz puppet-5915814c47649bb4b957b4be4fcee5919b859451.zip | |
Revert "(#6928) Removed --ignoreimport"
This reverts commit 24a277c5e805ce16e0b86e17e6cb2fbe1945ae07.
Despite not needing --ignoreimport as an option anymore, it's still used
internally and has to stay.
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/rdoc.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/puppet/util/rdoc.rb b/lib/puppet/util/rdoc.rb index 2a6dbdfa5..c00bc6f85 100644 --- a/lib/puppet/util/rdoc.rb +++ b/lib/puppet/util/rdoc.rb @@ -6,6 +6,8 @@ module Puppet::Util::RDoc # launch a rdoc documenation process # with the files/dir passed in +files+ def rdoc(outputdir, files, charset = nil) + Puppet[:ignoreimport] = true + # then rdoc require 'rdoc/rdoc' require 'rdoc/options' @@ -39,6 +41,7 @@ module Puppet::Util::RDoc # launch a output to console manifest doc def manifestdoc(files) + Puppet[:ignoreimport] = true files.select { |f| FileTest.file?(f) }.each do |f| parser = Puppet::Parser::Parser.new(Puppet::Node::Environment.new(Puppet[:environment])) parser.file = f |