diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-04 12:29:03 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-04 12:29:03 -0700 |
| commit | 4533aa16ec8c9ea4db2fc7de75b01ea056bcf624 (patch) | |
| tree | 1f9a972820ee888e4668d36c981082a92b7754c2 /lib/puppet/face | |
| parent | e5b62d7424da24799c4d16f0e104fac3008e2b89 (diff) | |
| parent | dda32647b4c11ecb352e469088f2438835ff99d7 (diff) | |
| download | puppet-4533aa16ec8c9ea4db2fc7de75b01ea056bcf624.tar.gz puppet-4533aa16ec8c9ea4db2fc7de75b01ea056bcf624.tar.xz puppet-4533aa16ec8c9ea4db2fc7de75b01ea056bcf624.zip | |
Merge branch 'bug/2.7.x/7353-unify-face-rendering-with-network-formathandler' into 2.7.x
Diffstat (limited to 'lib/puppet/face')
| -rw-r--r-- | lib/puppet/face/catalog/select.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/face/plugin.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/face/catalog/select.rb b/lib/puppet/face/catalog/select.rb index a8ecd82fa..a68a8e0f3 100644 --- a/lib/puppet/face/catalog/select.rb +++ b/lib/puppet/face/catalog/select.rb @@ -15,7 +15,7 @@ Puppet::Face.define(:catalog, '0.0.1') do end end - when_rendering :for_humans do |value| + when_rendering :console do |value| if value.nil? then "no matching resources found" else diff --git a/lib/puppet/face/plugin.rb b/lib/puppet/face/plugin.rb index 4b45ed3a1..8a2559405 100644 --- a/lib/puppet/face/plugin.rb +++ b/lib/puppet/face/plugin.rb @@ -20,7 +20,7 @@ Puppet::Face.define(:plugin, '0.0.1') do Puppet[:pluginsignore]).evaluate end - when_rendering :for_humans do |value| + when_rendering :console do |value| if value.empty? then "No plugins downloaded." else |