diff options
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/client/master.rb | 2 | ||||
| -rwxr-xr-x | lib/puppet/network/handler/report.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index e7739ba34..7eb009b2d 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -544,7 +544,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client # Have the facts changed since we last compiled? def facts_changed?(facts) - oldfacts = Puppet::Util::Storage.cache(:configuration)[:facts].dup + oldfacts = (Puppet::Util::Storage.cache(:configuration)[:facts] || {}).dup newfacts = facts.dup self.class.dynamic_facts.each do |fact| [oldfacts, newfacts].each do |facthash| diff --git a/lib/puppet/network/handler/report.rb b/lib/puppet/network/handler/report.rb index ce5176a36..827f5978b 100755 --- a/lib/puppet/network/handler/report.rb +++ b/lib/puppet/network/handler/report.rb @@ -65,7 +65,7 @@ class Puppet::Network::Handler # List each of the reports. def self.reports instance_loader(:report).loadall - @reports.keys + loaded_instances(:report) end def initialize(*args) |