From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id EA894D138 for ; Wed, 20 Sep 2023 13:40:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C431C15247 for ; Wed, 20 Sep 2023 13:40:19 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 20 Sep 2023 13:40:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 79CDD48424 for ; Wed, 20 Sep 2023 13:40:18 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Wed, 20 Sep 2023 13:39:35 +0200 Message-ID: <20230920114012.712670-1-c.heiss@proxmox.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.038 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [main.rs] Subject: [pve-devel] [PATCH installer] tui: honor test mode flag when starting low-level install session X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Sep 2023 11:40:50 -0000 Even if the installer is run in release mode, the test-mode flag should be honored on whether to start a test-installation or not. The test mode is always forced on in debug builds, so the cfg() conditionals can be dropped. Signed-off-by: Christoph Heiss --- proxmox-tui-installer/src/main.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/proxmox-tui-installer/src/main.rs b/proxmox-tui-installer/src/main.rs index 23a4ead..3f01713 100644 --- a/proxmox-tui-installer/src/main.rs +++ b/proxmox-tui-installer/src/main.rs @@ -727,6 +727,7 @@ fn install_progress_dialog(siv: &mut Cursive) -> InstallerView { let cb_sink = siv.cb_sink().clone(); let state = siv.user_data::().unwrap(); + let in_test_mode = state.in_test_mode; let progress_text = TextContent::new("starting the installation .."); let progress_task = { @@ -736,16 +737,15 @@ fn install_progress_dialog(siv: &mut Cursive) -> InstallerView { let child = { use std::process::{Command, Stdio}; - #[cfg(not(debug_assertions))] - let (path, args, envs): (&str, [&str; 1], [(&str, &str); 0]) = - ("proxmox-low-level-installer", ["start-session"], []); - - #[cfg(debug_assertions)] - let (path, args, envs) = ( - PathBuf::from("./proxmox-low-level-installer"), - ["-t", "start-session-test"], - [("PERL5LIB", ".")], - ); + let (path, args, envs): (&str, &[&str], Vec<(&str, &str)>) = if in_test_mode { + ( + "./proxmox-low-level-installer", + &["-t", "start-session-test"], + vec![("PERL5LIB", ".")], + ) + } else { + ("proxmox-low-level-installer", &["start-session"], vec![]) + }; Command::new(path) .args(args) -- 2.41.0