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

[Luke Kanies]

The following commit has been merged in the experimental branch:
commit 84ba21e66660a67e20c1194780138317e6a39d49
Author: Luke Kanies <luke at puppetlabs.com>
Date:   Mon Mar 21 15:51:21 2011 -0700

    Fixing a load-order issue in Puppet::Interface
    
    The application classes were having issues loading
    the Interface class in certain circumstances because of
    load order.  This just pushes the loading as late as possible.
    
    Signed-off-by: Luke Kanies <luke at puppetlabs.com>

diff --git a/lib/puppet/application/indirection_base.rb b/lib/puppet/application/indirection_base.rb
index 2d30aa7..7d1c851 100644
--- a/lib/puppet/application/indirection_base.rb
+++ b/lib/puppet/application/indirection_base.rb
@@ -1,5 +1,4 @@
 require 'puppet/application/interface_base'
-require 'puppet/interface'
 
 class Puppet::Application::IndirectionBase < Puppet::Application::InterfaceBase
   option("--terminus TERMINUS") do |arg|
diff --git a/lib/puppet/application/interface_base.rb b/lib/puppet/application/interface_base.rb
index 1f18b08..f2c147f 100644
--- a/lib/puppet/application/interface_base.rb
+++ b/lib/puppet/application/interface_base.rb
@@ -1,5 +1,4 @@
 require 'puppet/application'
-require 'puppet/interface'
 
 class Puppet::Application::InterfaceBase < Puppet::Application
   should_parse_config
@@ -41,6 +40,11 @@ class Puppet::Application::InterfaceBase < Puppet::Application
     @exit_code || 0
   end
 
+  def initialize(*args)
+    require 'puppet/interface'
+    super
+  end
+
   def main
     # Call the method associated with the provided action (e.g., 'find').
     if result = interface.send(verb, *arguments)

-- 
Puppet packaging for Debian