Resolve merge conflict and preserve installer hardening

This commit is contained in:
Kevin Veen-Birkenbach committed 2026-02-13 18:24:34 +01:00
commit f35ea04d66
4 files changed
+8 -5

No files matched your search

+1 -3
View File
@@ -395,9 +395,7 @@ class WebInstaller(Installer):
try:
page.goto(base_url, wait_until="domcontentloaded")
_wait_for_installer_interactive(
page, timeout_s=INSTALLER_READY_TIMEOUT_S
)
_wait_for_installer_interactive(page, timeout_s=INSTALLER_READY_TIMEOUT_S)
_page_warnings(page)
progress_deadline = time.time() + INSTALLER_STEP_DEADLINE_S