From 2ee613ec62ddeac1e0de15dbb7e86d2726a53760 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Wed, 18 Sep 2024 04:15:40 +0500 Subject: [PATCH] Minor fixes --- .../middlewared/plugins/zfs_/dataset_actions.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/middlewared/middlewared/plugins/zfs_/dataset_actions.py b/src/middlewared/middlewared/plugins/zfs_/dataset_actions.py index 3a9096fddc3b..45dedb4e2c2c 100644 --- a/src/middlewared/middlewared/plugins/zfs_/dataset_actions.py +++ b/src/middlewared/middlewared/plugins/zfs_/dataset_actions.py @@ -74,7 +74,7 @@ def mount(self, name, options): dataset.mount() except libzfs.ZFSException as e: self.logger.error('Failed to mount dataset', exc_info=True) - handle_ds_not_found(e, name) + handle_ds_not_found(e.code, name) raise CallError(f'Failed to mount dataset: {e}') @accepts(Str('name'), Dict('options', Bool('force', default=False))) @@ -85,7 +85,7 @@ def umount(self, name, options): dataset.umount(force=options['force']) except libzfs.ZFSException as e: self.logger.error('Failed to umount dataset', exc_info=True) - handle_ds_not_found(e, name) + handle_ds_not_found(e.code, name) raise CallError(f'Failed to umount dataset: {e}') @accepts( @@ -103,7 +103,7 @@ def rename(self, name, options): dataset.rename(options['new_name'], recursive=options['recursive']) except libzfs.ZFSException as e: self.logger.error('Failed to rename dataset', exc_info=True) - handle_ds_not_found(e, name) + handle_ds_not_found(e.code, name) raise CallError(f'Failed to rename dataset: {e}') def promote(self, name): @@ -113,7 +113,7 @@ def promote(self, name): dataset.promote() except libzfs.ZFSException as e: self.logger.error('Failed to promote dataset', exc_info=True) - handle_ds_not_found(e, name) + handle_ds_not_found(e.code, name) raise CallError(f'Failed to promote dataset: {e}') def inherit(self, name, prop, recursive=False): @@ -125,7 +125,7 @@ def inherit(self, name, prop, recursive=False): raise CallError(f'Property {prop!r} not found.', errno.ENOENT) zprop.inherit(recursive=recursive) except libzfs.ZFSException as e: - handle_ds_not_found(e, name) + handle_ds_not_found(e.code, name) if prop != 'mountpoint': raise CallError(str(e))