summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorPieter van de Bruggen <pieter@puppetlabs.com>2011-03-21 15:04:42 -0700
committerPieter van de Bruggen <pieter@puppetlabs.com>2011-03-21 15:04:42 -0700
commitba67cc8a39012a9c28a509d797f46decfdeb32d5 (patch)
tree0c6da6e857c60b4de8ab24b79f6b9d31ec58ba87 /lib/puppet
parent29ba159414c5bab3c14c98b9c5f097e8ef68fcee (diff)
downloadpuppet-ba67cc8a39012a9c28a509d797f46decfdeb32d5.tar.gz
puppet-ba67cc8a39012a9c28a509d797f46decfdeb32d5.tar.xz
puppet-ba67cc8a39012a9c28a509d797f46decfdeb32d5.zip
(#6785) Internal consistency for `--terminus`.
Paired-With: Richard Crowley
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/application/indirection_base.rb6
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