From: Christoph Heiss <c.heiss@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH installer 3/4] assistant: pre-compile ignored block device patterns
Date: Tue, 7 May 2024 15:21:36 +0200 [thread overview]
Message-ID: <20240507132220.1218652-4-c.heiss@proxmox.com> (raw)
In-Reply-To: <20240507132220.1218652-1-c.heiss@proxmox.com>
No functional changes.
Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
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<BTreeMap<String, BTreeMap<String, String>>> {
- 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<BTreeMap<String, BTreeMap<String, String>>> {
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
next prev parent reply other threads:[~2024-05-07 13:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-07 13:21 [pve-devel] [PATCH installer 0/4] assistant: clean up glob patterns & regexes Christoph Heiss
2024-05-07 13:21 ` [pve-devel] [PATCH installer 1/4] tree-wide: run rustfmt, fix clippy warnings Christoph Heiss
2024-05-07 13:21 ` [pve-devel] [PATCH installer 2/4] assistant: drop unused `log` dependency Christoph Heiss
2024-05-07 13:21 ` Christoph Heiss [this message]
2024-05-07 13:21 ` [pve-devel] [PATCH installer 4/4] assistant: avoid regex for simple prefix matching Christoph Heiss
2024-05-13 9:18 ` [pve-devel] [PATCH installer 0/4] assistant: clean up glob patterns & regexes Aaron Lauterer
2024-05-13 9:50 ` Christoph Heiss
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240507132220.1218652-4-c.heiss@proxmox.com \
--to=c.heiss@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox