command: make sure that all _handle_aliases() calls returns {}

module_common: also work if there are no aliases (shell, command, etc) modules
This commit is contained in:
Seth Vidal 2013-02-25 17:07:47 -05:00
parent b54887b03c
commit f02ea15f0c
2 changed files with 4 additions and 6 deletions

View file

@ -592,10 +592,8 @@ class AnsibleModule(object):
passwd_keys = ['password', 'login_password'] passwd_keys = ['password', 'login_password']
for param in self.params: for param in self.params:
no_log = False
if self.aliases:
canon = self.aliases.get(param, param) canon = self.aliases.get(param, param)
arg_opts = self.argument_spec[canon] arg_opts = self.argument_spec.get(canon, {})
no_log = arg_opts.get('no_log', False) no_log = arg_opts.get('no_log', False)
if no_log: if no_log:

View file

@ -129,7 +129,7 @@ def main():
class CommandModule(AnsibleModule): class CommandModule(AnsibleModule):
def _handle_aliases(self): def _handle_aliases(self):
pass return {}
def _check_invalid_arguments(self): def _check_invalid_arguments(self):
pass pass