[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Pieter van de Bruggen]

The following commit has been merged in the experimental branch:
commit ba67cc8a39012a9c28a509d797f46decfdeb32d5
Author: Pieter van de Bruggen <pieter at puppetlabs.com>
Date:   Mon Mar 21 15:04:42 2011 -0700

    (#6785) Internal consistency for `--terminus`.
    
    Paired-With: Richard Crowley

diff --git a/lib/puppet/application/indirection_base.rb b/lib/puppet/application/indirection_base.rb
index 7640989..2d30aa7 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

-- 
Puppet packaging for Debian