From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 7B3761FF389 for ; Tue, 7 May 2024 15:22:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 39C5CEA2E; Tue, 7 May 2024 15:22:30 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Tue, 7 May 2024 15:21:36 +0200 Message-ID: <20240507132220.1218652-4-c.heiss@proxmox.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240507132220.1218652-1-c.heiss@proxmox.com> References: <20240507132220.1218652-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.005 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 3/4] assistant: pre-compile ignored block device patterns 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" No functional changes. Signed-off-by: Christoph Heiss --- proxmox-auto-install-assistant/src/main.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/proxmox-auto-install-assistant/src/main.rs b/proxmox-auto-install-assistant/src/main.rs index 0debd29..906f144 100644 --- a/proxmox-auto-install-assistant/src/main.rs +++ b/proxmox-auto-install-assistant/src/main.rs @@ -392,13 +392,13 @@ fn inject_file_to_iso(iso: &PathBuf, file: &PathBuf, location: &str) -> Result<( } fn get_disks() -> Result>> { - let unwantend_block_devs = vec![ - "ram[0-9]*", - "loop[0-9]*", - "md[0-9]*", - "dm-*", - "fd[0-9]*", - "sr[0-9]*", + let unwanted_block_devs = [ + Pattern::new("ram[0-9]*")?, + Pattern::new("loop[0-9]*")?, + Pattern::new("md[0-9]*")?, + Pattern::new("dm-*")?, + Pattern::new("fd[0-9]*")?, + Pattern::new("sr[0-9]*")?, ]; // compile Regex here once and not inside the loop @@ -415,8 +415,8 @@ fn get_disks() -> Result>> { let entry = entry.unwrap(); let filename = entry.file_name().into_string().unwrap(); - for p in &unwantend_block_devs { - if Pattern::new(p)?.matches(&filename) { + for p in &unwanted_block_devs { + if p.matches(&filename) { continue 'outer; } } -- 2.44.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel