diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-05 16:31:25 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-05 16:31:25 -0700 |
| commit | dfc7e2725f4d80d57aa92bccb14c60b91acbf557 (patch) | |
| tree | 9b926e293d8e0bb0cf92c136b0975c2bbf491ff7 /lib/puppet/interface/action_builder.rb | |
| parent | 1c7bb924bd38042a6b03b5e7a32c24c602087eea (diff) | |
| parent | 61edff9ba5e8e4f8db8bb9cd5a84a986b8703c5d (diff) | |
| download | puppet-dfc7e2725f4d80d57aa92bccb14c60b91acbf557.tar.gz puppet-dfc7e2725f4d80d57aa92bccb14c60b91acbf557.tar.xz puppet-dfc7e2725f4d80d57aa92bccb14c60b91acbf557.zip | |
Merge branch 'bug/2.7.x/7353-kill-for-humans-format-entirely' into 2.7.x
Diffstat (limited to 'lib/puppet/interface/action_builder.rb')
| -rw-r--r-- | lib/puppet/interface/action_builder.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/interface/action_builder.rb b/lib/puppet/interface/action_builder.rb index 16305530a..62db8de06 100644 --- a/lib/puppet/interface/action_builder.rb +++ b/lib/puppet/interface/action_builder.rb @@ -38,9 +38,7 @@ 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 + formats = Puppet::Network::FormatHandler.formats unless formats.include? value raise ArgumentError, "#{value.inspect} is not a valid rendering format: #{formats.sort.join(", ")}" end |