Changing Puppet::Cacher::Expirer#expired? method name

This method name clashed with Puppet::Indirector::Envelope#expired?,
and its name wasn't actually very appropriate.

The new method name is 'dependent_data_expired?'.

Signed-off-by: Luke Kanies <luke@madstop.com>

3 files changed, 4 insertions, 3 deletions

diff --git a/lib/puppet/indirector/indirection.rb b/lib/puppet/indirector/indirection.rb
index 2a54ecc24..0623446d1 100644
--- a/lib/puppet/indirector/indirection.rb
+++ b/lib/puppet/indirector/indirection.rb
@@ -190,6 +190,7 @@ class Puppet::Indirector::Indirection
                 return result
             end
         rescue => detail
+            puts detail.backtrace if Puppet[:trace]
             Puppet.err "Cached %s for %s failed: %s" % [self.name, request.key, detail]
         end
 
diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb
index 4f60f6e56..859daa654 100644
--- a/lib/puppet/resource/catalog.rb
+++ b/lib/puppet/resource/catalog.rb
@@ -190,7 +190,7 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph
         resource
     end
 
-    def expired?(ts)
+    def dependent_data_expired?(ts)
         if applying?
             return super
         else
diff --git a/lib/puppet/util/cacher.rb b/lib/puppet/util/cacher.rb
index e42577686..2996dc9c6 100644
--- a/lib/puppet/util/cacher.rb
+++ b/lib/puppet/util/cacher.rb
@@ -9,7 +9,7 @@ module Puppet::Util::Cacher
 
         # Is the provided timestamp earlier than our expiration timestamp?
         # If it is, then the associated value is expired.
-        def expired?(ts)
+        def dependent_data_expired?(ts)
             return false unless timestamp
 
             return timestamp > ts
@@ -112,7 +112,7 @@ module Puppet::Util::Cacher
             if expirer.nil?
                 return true unless self.class.attr_ttl(name)
             end
-            return expirer.expired?(cache_timestamp)
+            return expirer.dependent_data_expired?(cache_timestamp)
         end
 
         def expired_by_ttl?(name)