diff --git a/src/decman/core/file_manager.py b/src/decman/core/file_manager.py index f2743e0..089232b 100644 --- a/src/decman/core/file_manager.py +++ b/src/decman/core/file_manager.py @@ -101,19 +101,19 @@ def _install_files( changed_files.append(target_filename) except FileNotFoundError as error: raise errors.FSInstallationFailedError( - target_filename, file.source_file or "content", "Source file doesn't exist." + file.source_file or "content", target_filename, "Source file doesn't exist." ) from error except OSError as error: raise errors.FSInstallationFailedError( - target_filename, file.source_file or "content", error.strerror or str(error) + file.source_file or "content", target_filename, error.strerror or str(error) ) from error except UnicodeEncodeError as error: raise errors.FSInstallationFailedError( - target_filename, file.source_file or "content", "Unicode encoding failed." + file.source_file or "content", target_filename, "Unicode encoding failed." ) from error except UnicodeDecodeError as error: raise errors.FSInstallationFailedError( - target_filename, file.source_file or "content", "Unicode decoding failed." + file.source_file or "content", target_filename, "Unicode decoding failed." ) from error return checked_files, changed_files @@ -135,21 +135,21 @@ def _install_directories( ) except FileNotFoundError as error: raise errors.FSInstallationFailedError( - target_dirname, directory.source_directory, + target_dirname, "Source directory doesn't exist.", ) from error except OSError as error: raise errors.FSInstallationFailedError( - target_dirname, directory.source_directory, error.strerror or str(error) + directory.source_directory, target_dirname, error.strerror or str(error) ) from error except UnicodeEncodeError as error: raise errors.FSInstallationFailedError( - target_dirname, directory.source_directory, "Unicode encoding failed." + directory.source_directory, target_dirname, "Unicode encoding failed." ) from error except UnicodeDecodeError as error: raise errors.FSInstallationFailedError( - target_dirname, directory.source_directory, "Unicode decoding failed." + directory.source_directory, target_dirname, "Unicode decoding failed." ) from error checked_files += checked diff --git a/tests/test_decman_core_file_manager.py b/tests/test_decman_core_file_manager.py index b89ef96..c9e6260 100644 --- a/tests/test_decman_core_file_manager.py +++ b/tests/test_decman_core_file_manager.py @@ -297,7 +297,7 @@ def test_update_files_propagates_fsinstallation_error_and_does_not_modify_store( # Fake failing _install_files def failing_install_files(*args, **kwargs): - raise errors.FSInstallationFailedError("/etc/app/broken.conf", "content", "fail") + raise errors.FSInstallationFailedError("content", "/etc/app/broken.conf", "fail") # Capture deletes removed = []