diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-07-22 13:30:05 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-07-22 13:30:05 -0700 |
| commit | feec7b3df713569f76b93ae8cef882e9ddc1bf35 (patch) | |
| tree | 89d10d48744e76da63a083de85a86d5b867565ca /lib/puppet/application | |
| parent | f309e1e45c456cc1d53469863f59cbad0df37241 (diff) | |
| parent | 532c4f37e4f8289cf4a9871ebc0cb5086c2ba26a (diff) | |
| download | puppet-feec7b3df713569f76b93ae8cef882e9ddc1bf35.tar.gz puppet-feec7b3df713569f76b93ae8cef882e9ddc1bf35.tar.xz puppet-feec7b3df713569f76b93ae8cef882e9ddc1bf35.zip | |
Merge branch 'feature/2.7.x/7184-better-action-loading' into 2.7.x
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/face_base.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/application/face_base.rb b/lib/puppet/application/face_base.rb index ea5ba4aaf..a111518f1 100644 --- a/lib/puppet/application/face_base.rb +++ b/lib/puppet/application/face_base.rb @@ -100,7 +100,8 @@ class Puppet::Application::FaceBase < Puppet::Application # action object it represents; if this is an invalid action name that # will be nil, and handled later. action_name = item.to_sym - @action = @face.get_action(action_name) + @action = Puppet::Face.find_action(@face.name, action_name) + @face = @action.face if @action end end |