Fixing the problem reported by Adnet Ghislain where facts do not load on later runs.

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

1 files changed, 7 insertions, 12 deletions

diff --git a/lib/puppet/client/master.rb b/lib/puppet/client/master.rb
index 8d7721ae5..0763cdfe1 100644
--- a/lib/puppet/client/master.rb
+++ b/lib/puppet/client/master.rb
@@ -539,9 +539,10 @@ class Puppet::Client::MasterClient < Puppet::Client
 
     # Retrieve facts from the central server.
     def self.getfacts
-        # First clear all existing definitions.
+        # Clear all existing definitions.
         Facter.clear
 
+        # Download the new facts
         path = Puppet[:factpath].split(":")
         files = []
         download(:dest => Puppet[:factdest], :source => Puppet[:factsource],
@@ -553,18 +554,8 @@ class Puppet::Client::MasterClient < Puppet::Client
 
         end
 
-        Facter.clear
-        files.each do |file|
-            begin
-                Puppet.info "Loading fact %s" %
-                    File.basename(File.basename(file)).sub(".rb",'')
-                load file
-            rescue => detail
-                Puppet.warning "Could not reload fact %s: %s" %
-                    [file, detail]
-            end
-        end
     ensure
+        # Reload everything.
         if Facter.respond_to? :loadfacts
             Facter.loadfacts
         elsif Facter.respond_to? :load
@@ -573,6 +564,10 @@ class Puppet::Client::MasterClient < Puppet::Client
             raise Puppet::Error,
                 "You must upgrade your version of Facter to use centralized facts"
         end
+
+        # This loads all existing facts and any new ones.  We have to remove and
+        # reload because there's no way to unload specific facts.
+        loadfacts()
     end
 
     # Retrieve the plugins from the central server.  We only have to load the