upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-07 15:52:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Special cased KeyboardInterrupt

Browse source
This commit is contained in:
Brad Warren 2015-06-26 16:09:46 -07:00
parent e97719b367
commit d6246ae309
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
letsencrypt/cli.py
View file

@ -676,10 +676,14 @@ def main(cli_args=sys.argv[1:]):
except errors.Error as error:
handle_exception_common()
return error
except: # pylint: disable=bare-except
except KeyboardInterrupt:
handle_exception_common()
# Ensures a new line is printed
return ""
except: # pylint: disable=bare-except
handle_exception_common()
return ("\nAn unexpected error occured. Please see the logfiles in {0} "
"for more details.".format(args.logs_dir))
if __name__ == "__main__":

4
letsencrypt/tests/cli_test.py
View file

@ -72,6 +72,10 @@ class CLITest(unittest.TestCase):
self._call(['--debug'] + cmd_arg, attrs)
self._call(cmd_arg, attrs)
attrs['view_config_changes.side_effect'] = [ValueError]
with self.assertRaises(ValueError):
self._call(['--debug'] + cmd_arg, attrs)
self._call(cmd_arg, attrs)
if __name__ == '__main__':
unittest.main() # pragma: no cover