diff options
| author | Luke Kanies <luke@puppetlabs.com> | 2011-03-21 15:51:21 -0700 |
|---|---|---|
| committer | Luke Kanies <luke@puppetlabs.com> | 2011-03-21 15:52:37 -0700 |
| commit | 84ba21e66660a67e20c1194780138317e6a39d49 (patch) | |
| tree | 3a4fe20b1ddbe2f48f6e425d4febc8f06cfb5ecf /lib | |
| parent | 23f4ff338949e085e42d778809a97f39be021da9 (diff) | |
| download | puppet-84ba21e66660a67e20c1194780138317e6a39d49.tar.gz puppet-84ba21e66660a67e20c1194780138317e6a39d49.tar.xz puppet-84ba21e66660a67e20c1194780138317e6a39d49.zip | |
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@puppetlabs.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/application/indirection_base.rb | 1 | ||||
| -rw-r--r-- | lib/puppet/application/interface_base.rb | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/puppet/application/indirection_base.rb b/lib/puppet/application/indirection_base.rb index 2d30aa707..7d1c851cf 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 1f18b086c..f2c147f1f 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) |