Merging of refactor-transacton to the trunk. This work removes the :is attribute from properties and relies on the provider to cache or return the current value of the property.

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

2 files changed, 5 insertions, 3 deletions

diff --git a/lib/puppet/provider/parsedfile.rb b/lib/puppet/provider/parsedfile.rb
index 8d1936ceb..334768d6b 100755
--- a/lib/puppet/provider/parsedfile.rb
+++ b/lib/puppet/provider/parsedfile.rb
@@ -273,9 +273,9 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
 
             # This is only the case for properties, and targets should always
             # be properties.
-            if model.respond_to?(:is)
-                targets << model.is(:target)
-            end
+            #if model.respond_to?(:is)
+            #    targets << model.is(:target)
+            #end
         end
 
         targets.uniq.reject { |t| t.nil? }
diff --git a/lib/puppet/provider/zone/solaris.rb b/lib/puppet/provider/zone/solaris.rb
index 572f137b0..e22192c22 100644
--- a/lib/puppet/provider/zone/solaris.rb
+++ b/lib/puppet/provider/zone/solaris.rb
@@ -114,6 +114,8 @@ set zonepath=%s
         return hash
     end
 
+    # FIXARB:  Not sure what this one is doing.  It is not setting @is for the
+    #          if case.
     def retrieve
         if hash = statushash()
             setstatus(hash)