Pass in '**results' to exit_json only if results is a dict (#33910)

pull/4420/head
Prasad Katti 2017-12-14 07:59:56 -08:00 committed by Sloane Hertel
parent 11063dabaf
commit 6995985a52
1 changed files with 4 additions and 1 deletions

View File

@ -350,7 +350,10 @@ def main():
elif state == 'absent': elif state == 'absent':
changed, result = delete(conn, module, matching_zones=zones) changed, result = delete(conn, module, matching_zones=zones)
module.exit_json(changed=changed, result=result, **result) if isinstance(result, dict):
module.exit_json(changed=changed, result=result, **result)
else:
module.exit_json(changed=changed, result=result)
if __name__ == '__main__': if __name__ == '__main__':
main() main()