From ba67cc8a39012a9c28a509d797f46decfdeb32d5 Mon Sep 17 00:00:00 2001
From: Pieter van de Bruggen <pieter@puppetlabs.com>
Date: Mon, 21 Mar 2011 15:04:42 -0700
Subject: (#6785) Internal consistency for `--terminus`.

Paired-With: Richard Crowley
---
 lib/puppet/application/indirection_base.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/puppet')

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
-- 
cgit