Partial merge to 2.6.2rc1 : Merge commit '99c1019' into next

This conflict was a little too complicated for diff to figure out, but
the resolution is actually fairly mechanical.
Some unit tests changed because they were mocking unnecessarily.

Manually Resolved Conflicts:
	lib/puppet/util/rdoc/parser.rb
	spec/unit/util/rdoc/parser_spec.rb

1 files changed, 11 insertions, 9 deletions

diff --git a/lib/puppet/util/rdoc/parser.rb b/lib/puppet/util/rdoc/parser.rb
index 30da607d9..aca66163c 100644
--- a/lib/puppet/util/rdoc/parser.rb
+++ b/lib/puppet/util/rdoc/parser.rb
@@ -33,17 +33,19 @@ class Parser
 
   # main entry point
   def scan
-    Puppet.info "rdoc: scanning #{@input_file_name}"
-    if @input_file_name =~ /\.pp$/
-      @parser = Puppet::Parser::Parser.new(Puppet[:environment])
-      environment = @parser.environment
-      @parser.file = @input_file_name
-      @known_resource_types = environment.known_resource_types
-      @parser.parse.instantiate('').each do |type|
-        @known_resource_types.add type
+    environment = Puppet::Node::Environment.new
+    unless environment.known_resource_types.watching_file?(@input_file_name)
+      Puppet.info "rdoc: scanning #{@input_file_name}"
+      if @input_file_name =~ /\.pp$/
+        @parser = Puppet::Parser::Parser.new(environment)
+        @parser.file = @input_file_name
+        @known_resource_types = environment.known_resource_types
+        @parser.parse.instantiate('').each do |type|
+          @known_resource_types.add type
+        end
+        scan_top_level(@top_level)
       end
     end
-    scan_top_level(@top_level)
     @top_level
   end