diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-04-13 15:51:43 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-04-13 15:51:43 -0700 |
| commit | 02691637553d5637ee01a433a516b5d8cc9768a9 (patch) | |
| tree | 9465b1ed4dcb64f68e6137be5ea094e8d305f5e9 /lib/puppet/util/rdoc.rb | |
| parent | 008770dba7946b67f252561fecd967c7fe67fd17 (diff) | |
| parent | 24a277c5e805ce16e0b86e17e6cb2fbe1945ae07 (diff) | |
| download | puppet-02691637553d5637ee01a433a516b5d8cc9768a9.tar.gz puppet-02691637553d5637ee01a433a516b5d8cc9768a9.tar.xz puppet-02691637553d5637ee01a433a516b5d8cc9768a9.zip | |
Merge branch 'ticket/next/6928' into next
Diffstat (limited to 'lib/puppet/util/rdoc.rb')
| -rw-r--r-- | lib/puppet/util/rdoc.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/puppet/util/rdoc.rb b/lib/puppet/util/rdoc.rb index c00bc6f85..2a6dbdfa5 100644 --- a/lib/puppet/util/rdoc.rb +++ b/lib/puppet/util/rdoc.rb @@ -6,8 +6,6 @@ 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' @@ -41,7 +39,6 @@ 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 |