diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-07-21 16:50:02 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-07-21 16:50:02 -0700 |
| commit | 9c78759af57967d64eceeeb704a6673b81a76f30 (patch) | |
| tree | 62474dc08399a36996b414dfa6c829978cc47a90 /lib/puppet/interface/action.rb | |
| parent | ba6230b6039d62b0713c9d5e3ff61a68f70ef723 (diff) | |
| parent | 5e2a3d200b74eef9549e3e2a5bdbe2a23ae7fac1 (diff) | |
| download | puppet-9c78759af57967d64eceeeb704a6673b81a76f30.tar.gz puppet-9c78759af57967d64eceeeb704a6673b81a76f30.tar.xz puppet-9c78759af57967d64eceeeb704a6673b81a76f30.zip | |
Merge branch '2.7.x'
* 2.7.x:
(#7123) Make `find` the default action...
(#7123) Support runtime setting of 'default' on actions.
(#6787) Add `default_to` for options.
(#6857) Password disclosure when changing a user's password
Diffstat (limited to 'lib/puppet/interface/action.rb')
| -rw-r--r-- | lib/puppet/interface/action.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/puppet/interface/action.rb b/lib/puppet/interface/action.rb index fe77a9658..fc1121eb6 100644 --- a/lib/puppet/interface/action.rb +++ b/lib/puppet/interface/action.rb @@ -199,6 +199,7 @@ def #{@name}(#{decl.join(", ")}) options = args.last action = get_action(#{name.inspect}) + action.add_default_args(args) action.validate_args(args) __invoke_decorations(:before, action, args, options) rval = self.__send__(#{internal_name.inspect}, *args) @@ -252,6 +253,14 @@ WRAPPER option end + def add_default_args(args) + options.map {|x| get_option(x) }.each do |option| + if option.has_default? and not option.aliases.any? {|x| args.last.has_key? x} + args.last[option.name] = option.default + end + end + end + def validate_args(args) # Check for multiple aliases for the same option... args.last.keys.each do |name| |