diff options
author | Paul Berry <paul@puppetlabs.com> | 2010-12-29 11:20:46 -0800 |
---|---|---|
committer | Paul Berry <paul@puppetlabs.com> | 2010-12-30 11:48:54 -0800 |
commit | 4cc42cda270cd1c04b22bf6e5452c550fb537ebf (patch) | |
tree | 5d51f8fa4d6d131dad6c2c3aa595ebe39d270843 | |
parent | 1907650515ca68e85e63c73e1a35ec30dbc81b0d (diff) | |
download | puppet-4cc42cda270cd1c04b22bf6e5452c550fb537ebf.tar.gz puppet-4cc42cda270cd1c04b22bf6e5452c550fb537ebf.tar.xz puppet-4cc42cda270cd1c04b22bf6e5452c550fb537ebf.zip |
(#5715) Removed redundant attribute Transaction::Event#version
-rw-r--r-- | lib/puppet/transaction/event.rb | 2 | ||||
-rw-r--r-- | lib/puppet/type.rb | 2 | ||||
-rwxr-xr-x | spec/unit/transaction/event_spec.rb | 2 | ||||
-rwxr-xr-x | spec/unit/type_spec.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/transaction/event.rb b/lib/puppet/transaction/event.rb index 49c2f1a2c..e3537bb08 100644 --- a/lib/puppet/transaction/event.rb +++ b/lib/puppet/transaction/event.rb @@ -7,7 +7,7 @@ class Puppet::Transaction::Event include Puppet::Util::Tagging include Puppet::Util::Logging - ATTRIBUTES = [:name, :resource, :property, :previous_value, :desired_value, :historical_value, :status, :message, :version, :file, :line, :source_description, :audited] + ATTRIBUTES = [:name, :resource, :property, :previous_value, :desired_value, :historical_value, :status, :message, :file, :line, :source_description, :audited] attr_accessor *ATTRIBUTES attr_writer :tags attr_accessor :time diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb index 1b6e7dcd7..ea3944b4e 100644 --- a/lib/puppet/type.rb +++ b/lib/puppet/type.rb @@ -446,7 +446,7 @@ class Type # Create a transaction event. Called by Transaction or by # a property. def event(options = {}) - Puppet::Transaction::Event.new({:resource => self, :file => file, :line => line, :tags => tags, :version => version}.merge(options)) + Puppet::Transaction::Event.new({:resource => self, :file => file, :line => line, :tags => tags}.merge(options)) end # Let the catalog determine whether a given cached value is diff --git a/spec/unit/transaction/event_spec.rb b/spec/unit/transaction/event_spec.rb index f1db3835b..4a3e6bad5 100755 --- a/spec/unit/transaction/event_spec.rb +++ b/spec/unit/transaction/event_spec.rb @@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' require 'puppet/transaction/event' describe Puppet::Transaction::Event do - [:previous_value, :desired_value, :property, :resource, :name, :message, :version, :file, :line, :tags].each do |attr| + [:previous_value, :desired_value, :property, :resource, :name, :message, :file, :line, :tags].each do |attr| it "should support #{attr}" do event = Puppet::Transaction::Event.new event.send(attr.to_s + "=", "foo") diff --git a/spec/unit/type_spec.rb b/spec/unit/type_spec.rb index 7416064a5..b7a08977e 100755 --- a/spec/unit/type_spec.rb +++ b/spec/unit/type_spec.rb @@ -153,7 +153,7 @@ describe Puppet::Type do @resource.event.default_log_level.should == :warning end - {:file => "/my/file", :line => 50, :tags => %{foo bar}, :version => 50}.each do |attr, value| + {:file => "/my/file", :line => 50, :tags => %{foo bar}}.each do |attr, value| it "should set the #{attr}" do @resource.stubs(attr).returns value @resource.event.send(attr).should == value |