cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[stable-2.7] Use IndexError in exception (#49488)

Browse source 
(cherry picked from commit 6200d32c0d)

Co-authored-by: Sam Doran <sdoran@redhat.com>
This commit is contained in:
Sam Doran 2018-12-04 14:12:00 -05:00 committed by Toshio Kuratomi
parent 799f8e97b3
commit 91b2347344
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/reboot-fix-exception-type.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- reboot - use IndexError instead of TypeError in exception

2
lib/ansible/plugins/action/reboot.py
View file

@ -189,7 +189,7 @@ class ActionModule(ActionBase):
if action_desc: if action_desc:
try: try:
error = to_text(e).splitlines()[-1] error = to_text(e).splitlines()[-1]
except TypeError as e: except IndexError as e:
error = to_text(e) error = to_text(e)
display.debug("{0}: {1} fail '{2}', retrying in {3:.4} seconds...".format(self._task.action, action_desc, display.debug("{0}: {1} fail '{2}', retrying in {3:.4} seconds...".format(self._task.action, action_desc,
error, fail_sleep)) error, fail_sleep))