diff options
| author | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-03-21 15:06:27 -0700 |
|---|---|---|
| committer | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-03-21 15:06:27 -0700 |
| commit | 9f379b641c05d7e25b4ae92ee449ca66512eff90 (patch) | |
| tree | 0c6da6e857c60b4de8ab24b79f6b9d31ec58ba87 /lib | |
| parent | 55877dd42da11ffa3cf00fb49db8cfd558ec0641 (diff) | |
| parent | ba67cc8a39012a9c28a509d797f46decfdeb32d5 (diff) | |
| download | puppet-9f379b641c05d7e25b4ae92ee449ca66512eff90.tar.gz puppet-9f379b641c05d7e25b4ae92ee449ca66512eff90.tar.xz puppet-9f379b641c05d7e25b4ae92ee449ca66512eff90.zip | |
Merge branch 'tickets/master/6785'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/application/indirection_base.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/puppet/application/indirection_base.rb b/lib/puppet/application/indirection_base.rb index 764098925..2d30aa707 100644 --- a/lib/puppet/application/indirection_base.rb +++ b/lib/puppet/application/indirection_base.rb @@ -3,10 +3,10 @@ require 'puppet/interface' class Puppet::Application::IndirectionBase < Puppet::Application::InterfaceBase option("--terminus TERMINUS") do |arg| - @from = arg + @terminus = arg end - attr_accessor :from, :indirection + attr_accessor :terminus, :indirection def setup super @@ -14,7 +14,7 @@ class Puppet::Application::IndirectionBase < Puppet::Application::InterfaceBase if interface.respond_to?(:indirection) raise "Could not find data type #{type} for application #{self.class.name}" unless interface.indirection - interface.set_terminus(from) if from + interface.set_terminus(terminus) if terminus end end end |