From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 2B7E11FF187 for ; Mon, 25 Aug 2025 15:21:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1A8D8133A1; Mon, 25 Aug 2025 15:21:31 +0200 (CEST) From: Shan Shaji To: pbs-devel@lists.proxmox.com Date: Mon, 25 Aug 2025 15:21:03 +0200 Message-ID: <20250825132103.225192-1-s.shaji@proxmox.com> X-Mailer: git-send-email 2.47.2 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1756128085056 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.180 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 Subject: [pbs-devel] [PATCH proxmox-backup v2] fix #6624: ui: improve task log output for protected entry X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Cc: Shan Shaji Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Using 'Prune All' gives incomplete task-log output for a 'protected' entry. To fix this, add match expression to convert `PruneMark` variants into strings. Signed-off-by: Shan Shaji --- changes since v1: - Removed nested if condition check. - Added match expression to convert the `PruneMark` variants to strings. - Updated commit message. src/server/prune_job.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/server/prune_job.rs b/src/server/prune_job.rs index 1c86647a..9d07558d 100644 --- a/src/server/prune_job.rs +++ b/src/server/prune_job.rs @@ -7,7 +7,7 @@ use pbs_api_types::{ print_store_and_ns, Authid, KeepOptions, Operation, PruneJobOptions, MAX_NAMESPACE_DEPTH, PRIV_DATASTORE_MODIFY, PRIV_DATASTORE_PRUNE, }; -use pbs_datastore::prune::compute_prune_info; +use pbs_datastore::prune::{compute_prune_info, PruneMark}; use pbs_datastore::DataStore; use proxmox_rest_server::WorkerTask; @@ -72,7 +72,13 @@ pub fn prune_datastore( if dry_run { "would " } else { "" }, group.backup_type(), group.backup_id(), - info.backup_dir.backup_time_string() + info.backup_dir.backup_time_string(), + mark = match mark { + PruneMark::Protected => "keep protected", + PruneMark::Keep => "keep", + PruneMark::KeepPartial => "keep partial", + PruneMark::Remove => "remove", + } ); if !keep && !dry_run { if let Err(err) = datastore.remove_backup_dir(ns, info.backup_dir.as_ref(), false) { -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel