summaryrefslogtreecommitdiffstats
path: root/lib/puppet/util/rdoc/parser.rb
diff options
context:
space:
mode:
authorBrice Figureau <brice-puppet@daysofwonder.com>2011-02-11 20:34:22 +0100
committerBrice Figureau <brice-puppet@daysofwonder.com>2011-02-11 20:34:22 +0100
commitcfa0c32fc5149464af97235a7bb458950d19cc82 (patch)
tree704414bedb586291897a6064a7e7570394429808 /lib/puppet/util/rdoc/parser.rb
parent48bc7d00ca87fa92cdde0b993529bba3827fa47e (diff)
downloadpuppet-cfa0c32fc5149464af97235a7bb458950d19cc82.tar.gz
puppet-cfa0c32fc5149464af97235a7bb458950d19cc82.tar.xz
puppet-cfa0c32fc5149464af97235a7bb458950d19cc82.zip
Fix #6281 - Make sure puppetdoc analyzes all files
It can happen that when parsing a file puppet parses other manifests if they get imported (this is at least true for site.pp, even in ignoreimport=true). Thus those files are now "watched". But puppetdoc needs to analyze all files, and since 99c101 we are now checking if the file was already parsed to not reparse it again. If that was the case, though, we weren't analyzing the produced code. Thus it was possible to not produce documentation for the site.pp content. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet/util/rdoc/parser.rb')
-rw-r--r--lib/puppet/util/rdoc/parser.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb
index f59af64f9..ea7439ad7 100644
--- a/lib/puppet/util/rdoc/parser.rb
+++ b/lib/puppet/util/rdoc/parser.rb
@@ -41,8 +41,10 @@ class Parser
@parser.file = @input_file_name
@ast = @parser.parse
end
- scan_top_level(@top_level)
+ else
+ @ast = env.known_resource_types
end
+ scan_top_level(@top_level)
@top_level
end