Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x

1 files changed, 13 insertions, 12 deletions

diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index b672d9564..ff019edb8 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -510,18 +510,19 @@ class Puppet::Util::Settings
             end
 
             # Only files are convertable to transportable resources.
-            if obj.respond_to? :to_transportable
-                next if value(obj.name) =~ /^\/dev/
-                transobjects = obj.to_transportable
-                transobjects = [transobjects] unless transobjects.is_a? Array
-                transobjects.each do |trans|
-                    # transportable could return nil
-                    next unless trans
-                    unless done[:file].include? trans.name
-                        @created << trans.name
-                        objects << trans
-                        done[:file][trans.name] = trans
-                    end
+            next unless obj.respond_to? :to_transportable
+            next if value(obj.name) =~ /^\/dev/
+            next if Puppet::Type::File[obj.value] # skip files that are in our global resource list.
+
+            transobjects = obj.to_transportable
+            transobjects = [transobjects] unless transobjects.is_a? Array
+            transobjects.each do |trans|
+                # transportable could return nil
+                next unless trans
+                unless done[:file].include? trans.name
+                    @created << trans.name
+                    objects << trans
+                    done[:file][trans.name] = trans
                 end
             end
         end