From c77bd1aa314e385eb89277288760e5d4eb778a50 Mon Sep 17 00:00:00 2001 From: Simon Stewart Date: Mon, 11 Sep 2023 11:15:51 +0100 Subject: [PATCH] Make sure offline sets associated flags (#12718) --- rust/src/main.rs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/rust/src/main.rs b/rust/src/main.rs index 9db7c072acf35..6278cb10a0955 100644 --- a/rust/src/main.rs +++ b/rust/src/main.rs @@ -157,17 +157,28 @@ fn main() { flush_and_exit(DATAERR, &log); }; - selenium_manager.set_logger(log); selenium_manager.set_browser_version(cli.browser_version.unwrap_or_default()); selenium_manager.set_driver_version(cli.driver_version.unwrap_or_default()); selenium_manager.set_browser_path(cli.browser_path.unwrap_or_default()); selenium_manager.set_os(cli.os.unwrap_or_default()); selenium_manager.set_arch(cli.arch.unwrap_or_default()); selenium_manager.set_ttl(cli.ttl); - selenium_manager.set_offline(cli.offline); selenium_manager.set_force_browser_download(cli.force_browser_download); selenium_manager.set_avoid_browser_download(cli.avoid_browser_download); selenium_manager.set_cache_path(cache_path.clone()); + selenium_manager.set_offline(cli.offline); + if cli.offline { + if cli.force_browser_download { + log.warn("Offline flag set, but also asked to force downloads. Honouring offline flag"); + } + selenium_manager.set_force_browser_download(false); + if !cli.avoid_browser_download { + log.warn("Offline flag set, but also asked not to avoid browser downloads. Honouring offline flag"); + } + selenium_manager.set_avoid_browser_download(true); + } + selenium_manager.set_logger(log); + if cli.clear_cache || BooleanKey("clear-cache", false).get_value() { clear_cache(selenium_manager.get_logger(), &cache_path);