diff options
| author | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-03-21 15:00:17 -0700 |
|---|---|---|
| committer | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-03-21 15:00:17 -0700 |
| commit | a7173dc2054c4167c71a23fb70e3ca54d07c7447 (patch) | |
| tree | ec8b3beb8a236149676bf545d7a9fe45cd4c7a3d /lib/puppet/application | |
| parent | b187e071ac1b334878498d52ee6c18f8c0e6a5d9 (diff) | |
| download | puppet-a7173dc2054c4167c71a23fb70e3ca54d07c7447.tar.gz puppet-a7173dc2054c4167c71a23fb70e3ca54d07c7447.tar.xz puppet-a7173dc2054c4167c71a23fb70e3ca54d07c7447.zip | |
(#6786) Fixing a number of failing tests.
The initial merge of this branch hadn't actually been run against the full
suite of specs; a number of specs began failing shortly afterward.
Reviewed-By: Daniel Pittman
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/indirection_base.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/application/interface_base.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application/indirection_base.rb b/lib/puppet/application/indirection_base.rb index e6d172ced..764098925 100644 --- a/lib/puppet/application/indirection_base.rb +++ b/lib/puppet/application/indirection_base.rb @@ -2,7 +2,7 @@ require 'puppet/application/interface_base' require 'puppet/interface' class Puppet::Application::IndirectionBase < Puppet::Application::InterfaceBase - option("--from TERMINUS", "-f") do |arg| + option("--terminus TERMINUS") do |arg| @from = arg end diff --git a/lib/puppet/application/interface_base.rb b/lib/puppet/application/interface_base.rb index 88f97b69b..1f18b086c 100644 --- a/lib/puppet/application/interface_base.rb +++ b/lib/puppet/application/interface_base.rb @@ -71,7 +71,7 @@ class Puppet::Application::InterfaceBase < Puppet::Application @type = self.class.name.to_s.sub(/.+:/, '').downcase.to_sym - unless @interface = Puppet::Interface.interface(@type) + unless @interface = Puppet::Interface.const_get(@type) raise "Could not find interface '#{@type}'" end @format ||= @interface.default_format |