Caching Time objects instead of numbers, since Bignum does not seem to be YAMLable

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

2 files changed, 2 insertions, 3 deletions

diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index 151233862..306f6c277 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -1328,7 +1328,7 @@ class Type < Puppet::Element
         # have been synced a long time ago (e.g., a file only gets updated
         # once a month on the server and its schedule is daily; the last sync time
         # will have been a month ago, so we'd end up checking every run).
-        return schedule.match?(self.cached(:checked))
+        return schedule.match?(self.cached(:checked).to_i)
     end
 
     # Is the specified parameter set?
@@ -1535,7 +1535,7 @@ class Type < Puppet::Element
     # this returns any changes resulting from testing, thus 'collect'
     # rather than 'each'
     def evaluate
-        now = Time.now.to_i
+        now = Time.now
 
         #Puppet.err "Evaluating %s" % self.path.join(":")
         unless defined? @evalcount
diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb
index 10ca20976..3010d51cf 100644
--- a/lib/puppet/type/pfile.rb
+++ b/lib/puppet/type/pfile.rb
@@ -216,7 +216,6 @@ module Puppet
             unless hash.include?(:recurse)
                 if args.include?(:recurse)
                     if args[:recurse].is_a?(Integer)
-                        self.notice "Decrementing recurse on %s" % path
                         args[:recurse] -= 1 # reduce the level of recursion
                     end
                 end