Change error parameter ordering

This commit is contained in:
Kivi Kaitaniemi
2025-12-13 04:42:08 +02:00
parent 786968feac
commit 7c34b3c7d2
2 changed files with 9 additions and 9 deletions
+8 -8
View File
@@ -101,19 +101,19 @@ def _install_files(
changed_files.append(target_filename) changed_files.append(target_filename)
except FileNotFoundError as error: except FileNotFoundError as error:
raise errors.FSInstallationFailedError( 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 ) from error
except OSError as error: except OSError as error:
raise errors.FSInstallationFailedError( 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 ) from error
except UnicodeEncodeError as error: except UnicodeEncodeError as error:
raise errors.FSInstallationFailedError( 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 ) from error
except UnicodeDecodeError as error: except UnicodeDecodeError as error:
raise errors.FSInstallationFailedError( 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 ) from error
return checked_files, changed_files return checked_files, changed_files
@@ -135,21 +135,21 @@ def _install_directories(
) )
except FileNotFoundError as error: except FileNotFoundError as error:
raise errors.FSInstallationFailedError( raise errors.FSInstallationFailedError(
target_dirname,
directory.source_directory, directory.source_directory,
target_dirname,
"Source directory doesn't exist.", "Source directory doesn't exist.",
) from error ) from error
except OSError as error: except OSError as error:
raise errors.FSInstallationFailedError( 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 ) from error
except UnicodeEncodeError as error: except UnicodeEncodeError as error:
raise errors.FSInstallationFailedError( raise errors.FSInstallationFailedError(
target_dirname, directory.source_directory, "Unicode encoding failed." directory.source_directory, target_dirname, "Unicode encoding failed."
) from error ) from error
except UnicodeDecodeError as error: except UnicodeDecodeError as error:
raise errors.FSInstallationFailedError( raise errors.FSInstallationFailedError(
target_dirname, directory.source_directory, "Unicode decoding failed." directory.source_directory, target_dirname, "Unicode decoding failed."
) from error ) from error
checked_files += checked checked_files += checked
+1 -1
View File
@@ -297,7 +297,7 @@ def test_update_files_propagates_fsinstallation_error_and_does_not_modify_store(
# Fake failing _install_files # Fake failing _install_files
def failing_install_files(*args, **kwargs): 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 # Capture deletes
removed = [] removed = []