Merge pull request #4553 from mmoya/features

Do key validation only when key is provided
This commit is contained in:
Michael DeHaan 2013-10-17 05:18:17 -07:00
commit 4484ba8a49

View file

@ -188,11 +188,12 @@ def main():
state = module.params['state'] state = module.params['state']
changed = False changed = False
try: if key_id:
_ = int(key_id, 16) try:
key_id = key_id.lstrip('0x') _ = int(key_id, 16)
except ValueError: key_id = key_id.lstrip('0x')
module.fail_json("Invalid key_id") except ValueError:
module.fail_json("Invalid key_id")
# FIXME: I think we have a common facility for this, if not, want # FIXME: I think we have a common facility for this, if not, want
check_missing_binaries(module) check_missing_binaries(module)