Fixing Files to work with the Resource server. Basically I just remove the "target" value if it is a nullop, so that it does not cause a conflict with "contents" on the far side.

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

1 files changed, 11 insertions, 0 deletions

diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb
index f87a1e201..650c7ad26 100644
--- a/lib/puppet/type/pfile.rb
+++ b/lib/puppet/type/pfile.rb
@@ -925,6 +925,17 @@ module Puppet
             return @stat
         end
 
+        # We have to hack this just a little bit, because otherwise we'll get
+        # an error when the target and the contents are created as states on
+        # the far side.
+        def to_trans
+            obj = super
+            if obj[:target] == :notlink
+                obj.delete(:target)
+            end
+            obj
+        end
+
         def uri2obj(source)
             sourceobj = FileSource.new
             path = nil