From: Max Carrara <m.carrara@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: Re: [pbs-devel] [PATCH proxmox-backup v2 4/6] fix #3690: cli: add function wipe_disk
Date: Tue, 28 Nov 2023 12:20:04 +0100 [thread overview]
Message-ID: <a58d6b2a-ef0c-4a7f-9b0a-6e60ce993187@proxmox.com> (raw)
In-Reply-To: <20231128103959.159650-5-m.frank@proxmox.com>
This patch doesn't seem to apply on master (as of commit 78fc7b0e94b5fb840432075cafcd07efd2873f81).
The remaining patches all apply if the rejected hunk is ignored.
Here's the rejected hunk in question:
diff a/src/bin/proxmox_backup_manager/disk.rs b/src/bin/proxmox_backup_manager/disk.rs (rejected hunks)
@@ -350,10 +376,10 @@ pub fn filesystem_commands() -> CommandLineInterface {
CliCommand::new(&API_METHOD_CREATE_DATASTORE_DISK)
.arg_param(&["name"])
.completion_cb("disk", complete_disk_name),
- ).insert(
+ )
+ .insert(
"delete",
- CliCommand::new(&API_METHOD_DELETE_DATASTORE_DISK)
- .arg_param(&["name"]),
+ CliCommand::new(&API_METHOD_DELETE_DATASTORE_DISK).arg_param(&["name"]),
);
cmd_def.into()
next prev parent reply other threads:[~2023-11-28 11:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-28 10:39 [pbs-devel] [PATCH proxmox-backup v2 0/6] fix #3690: wipe disk Markus Frank
2023-11-28 10:39 ` [pbs-devel] [PATCH proxmox-backup v2 1/6] fix #3690: pbs_api_types: add regex, format & schema for partition names to pbs-api-types Markus Frank
2023-11-28 10:39 ` [pbs-devel] [PATCH proxmox-backup v2 2/6] fix #3690: tools: add wipe_blockdev & change_parttype rust equivalent Markus Frank
2023-11-28 10:39 ` [pbs-devel] [PATCH proxmox-backup v2 3/6] fix #3690: api: add function wipe_disk Markus Frank
2023-11-28 10:39 ` [pbs-devel] [PATCH proxmox-backup v2 4/6] fix #3690: cli: " Markus Frank
2023-11-28 11:18 ` Philipp Hufnagl
2023-11-28 11:21 ` Max Carrara
2023-11-28 11:20 ` Max Carrara [this message]
2023-11-28 10:39 ` [pbs-devel] [PATCH proxmox-backup v2 5/6] fix #3690: ui: enable wipe disk in StorageAndDisks Markus Frank
2023-11-28 10:39 ` [pbs-devel] [PATCH proxmox-backup v2 6/6] tools: prohibit disk wipe of EFI partition Markus Frank
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=a58d6b2a-ef0c-4a7f-9b0a-6e60ce993187@proxmox.com \
--to=m.carrara@proxmox.com \
--cc=pbs-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