summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/puppet/interface/action_builder.rb2
-rwxr-xr-xspec/unit/interface/action_builder_spec.rb2
2 files changed, 4 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(", ")}"
diff --git a/spec/unit/interface/action_builder_spec.rb b/spec/unit/interface/action_builder_spec.rb
index e0d0ebe72..89aef26d0 100755
--- a/spec/unit/interface/action_builder_spec.rb
+++ b/spec/unit/interface/action_builder_spec.rb
@@ -200,6 +200,8 @@ describe Puppet::Interface::ActionBuilder do
end
end
+ # :for_humans is an alias for :console, and deprecated, but since we
+ # shipped it in 2.7.0rc1 we need to support it. --daniel 2011-05-04
it "should accept :for_humans format" do
action = Puppet::Interface::ActionBuilder.build(face, :foo) do
when_invoked do true end