matrix/weechat-matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

commands: Catch an OSErrors for key imports/exports as well.

Browse source
This commit is contained in:
Damir Jelić 2019-02-01 21:08:12 +01:00
parent b1d1871d11
commit 54ad615431
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
matrix/commands.py
View file

@ -695,7 +695,7 @@ def olm_export_command(server, args):
file_path = os.path.expanduser(args.file) file_path = os.path.expanduser(args.file)
try: try:
server.client.export_keys(file_path, args.passphrase) server.client.export_keys(file_path, args.passphrase)
except IOError as e: except (OSError, IOError) as e:
server.error("Error exporting keys: {}".format(str(e))) server.error("Error exporting keys: {}".format(str(e)))
server.info("Succesfully exported keys") server.info("Succesfully exported keys")
@ -704,7 +704,7 @@ def olm_import_command(server, args):
file_path = os.path.expanduser(args.file) file_path = os.path.expanduser(args.file)
try: try:
server.client.import_keys(file_path, args.passphrase) server.client.import_keys(file_path, args.passphrase)
except (IOError, EncryptionError) as e: except (OSError, IOError, EncryptionError) as e:
server.error("Error importing keys: {}".format(str(e))) server.error("Error importing keys: {}".format(str(e)))
server.info("Succesfully imported keys") server.info("Succesfully imported keys")