Merge branch '0.24.x'

4 files changed, 4 insertions, 4 deletions

diff --git a/lib/puppet/util/checksums.rb b/lib/puppet/util/checksums.rb
index 598b3adfa..15d2eadd1 100644
--- a/lib/puppet/util/checksums.rb
+++ b/lib/puppet/util/checksums.rb
@@ -55,7 +55,7 @@ module Puppet::Util::Checksums
     end
 
     # Return the :ctime of a file.
-    def timestamp_file(filename)
+    def ctime_file(filename)
         File.stat(filename).send(:ctime)
     end
 
diff --git a/lib/puppet/util/filetype.rb b/lib/puppet/util/filetype.rb
index 1c7734cc4..bbc837e75 100755
--- a/lib/puppet/util/filetype.rb
+++ b/lib/puppet/util/filetype.rb
@@ -165,7 +165,7 @@ class Puppet::Util::FileType
 
         # Remove a specific @path's cron tab.
         def remove
-            if Facter.value("operatingsystem") == "FreeBSD"
+            if %w{Darwin FreeBSD}.include?(Facter.value("operatingsystem"))
                 %x{/bin/echo yes | #{cmdbase()} -r 2>/dev/null}
             else
                 %x{#{cmdbase()} -r 2>/dev/null}
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 2c8fc682a..5f4a98558 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -1070,7 +1070,7 @@ Generated on #{Time.now}.
 
             return nil unless path.is_a?(String)
             return nil if path =~ /^\/dev/
-            return nil if Puppet::Type::File[path] # skip files that are in our global resource list.
+            return nil if Puppet::Type.type(:file)[path] # skip files that are in our global resource list.
 
             objects = []
 
diff --git a/lib/puppet/util/tagging.rb b/lib/puppet/util/tagging.rb
index 9abb3fb2b..8a50f3458 100644
--- a/lib/puppet/util/tagging.rb
+++ b/lib/puppet/util/tagging.rb
@@ -34,6 +34,6 @@ module Puppet::Util::Tagging
     private
 
     def valid_tag?(tag)
-        tag =~ /^\w[-\w:]*$/
+        tag =~ /^\w[-\w:.]*$/
     end
 end