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/interface | |
| parent | e5b62d7424da24799c4d16f0e104fac3008e2b89 (diff) | |
| parent | dda32647b4c11ecb352e469088f2438835ff99d7 (diff) | |
Merge branch 'bug/2.7.x/7353-unify-face-rendering-with-network-formathandler' into 2.7.x
Diffstat (limited to 'lib/puppet/interface')
| -rw-r--r-- | lib/puppet/interface/action_builder.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/interface/action_builder.rb b/lib/puppet/interface/action_builder.rb index 0bf4f1408..16305530a 100644 --- a/lib/puppet/interface/action_builder.rb +++ b/lib/puppet/interface/action_builder.rb @@ -38,6 +38,8 @@ class Puppet::Interface::ActionBuilder def render_as(value = nil) value.nil? and raise ArgumentError, "You must give a rendering format to render_as" + # :for_humans is a compatibility alias for :console, but since we shipped + # it in 2.7.0rc1 we need to support it ongoing. --daniel 2011-05-04 formats = Puppet::Network::FormatHandler.formats << :for_humans unless formats.include? value raise ArgumentError, "#{value.inspect} is not a valid rendering format: #{formats.sort.join(", ")}" |