summaryrefslogtreecommitdiffstats
path: root/lib/puppet/interface/action.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/interface/action.rb')
-rw-r--r--lib/puppet/interface/action.rb9
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|