Further small bug fixes towards running puppet on my network

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@729 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 3 insertions, 29 deletions

diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index e6a0bdc2b..557af958b 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -87,35 +87,6 @@ module Puppet
                     end
                     raise error
                 end
-
-                # okay, at this point we have a tree of scopes, and we want to
-                # unzip along that tree, building our structure of objects
-                # to pass to the client
-                # this will be heirarchical, and will (at this point) contain
-                # only TransObjects and TransSettings
-                #@scope.name = "top"
-                #@scope.type = "puppet"
-                #begin
-                #    topbucket = @scope.to_trans
-                #rescue => detail
-                #    Puppet.warning detail
-                #    raise
-                #end
-
-                # add our settings to the front of the array
-                # at least, for now
-                #@topscope.typesets.each { |setting|
-                #    topbucket.unshift setting
-                #}
-
-                # guarantee that settings are at the very top
-                #topbucket.push settingbucket
-                #topbucket.push @scope.to_trans
-
-                #retlist = TransObject.list
-                #Puppet.debug "retobject length is %s" % retlist.length
-                #TransObject.clear
-                #return topbucket
             end
 
             def scope
@@ -158,11 +129,14 @@ module Puppet
                     end
                 end
 
+                Puppet.info "Reloading files"
                 # should i be creating a new parser each time...?
                 @parser = Puppet::Parser::Parser.new()
                 @parser.file = @file
                 @ast = @parser.parse
 
+                # Reevaluate the config.  This is what actually replaces the
+                # existing scope.
                 evaluate
             end
         end