diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-05-17 10:16:03 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-05-17 10:16:03 -0700 |
| commit | 5457c70a66ef95482391e39e43f1fa99ac83e721 (patch) | |
| tree | 4404cb2a154461798374e93f99d989325a1a76d4 /lib/puppet/interface/action.rb | |
| parent | 009c961ec6e71621cd984b98a5d4e3c855dbaee4 (diff) | |
| parent | 9da1454e71b8330e929ac5616eefa44388c90832 (diff) | |
| download | puppet-5457c70a66ef95482391e39e43f1fa99ac83e721.tar.gz puppet-5457c70a66ef95482391e39e43f1fa99ac83e721.tar.xz puppet-5457c70a66ef95482391e39e43f1fa99ac83e721.zip | |
Merge branch 'ticket/2.7.x/7507-filter_19_failures' into 2.7.x
* ticket/2.7.x/7507-filter_19_failures:
(#7507) Add ability to filter Ruby 1.9 spec failures
(#7507) Fix when_invoked action specs in Ruby 1.9
Diffstat (limited to 'lib/puppet/interface/action.rb')
| -rw-r--r-- | lib/puppet/interface/action.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/interface/action.rb b/lib/puppet/interface/action.rb index 622371a4e..3c377a49f 100644 --- a/lib/puppet/interface/action.rb +++ b/lib/puppet/interface/action.rb @@ -192,7 +192,7 @@ class Puppet::Interface::Action # but will on 1.9.2, which treats it as "no arguments". Which bites, # because this just begs for us to wind up in the horrible situation # where a 1.8 vs 1.9 error bites our end users. --daniel 2011-04-19 - raise ArgumentError, "action when_invoked requires at least one argument (options)" + raise ArgumentError, "when_invoked requires at least one argument (options) for action #{@name}" elsif arity > 0 then range = Range.new(1, arity - 1) decl = range.map { |x| "arg#{x}" } << "options = {}" |