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 75F1B1FF183 for ; Wed, 27 Aug 2025 13:58:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 82853189BB; Wed, 27 Aug 2025 13:58:01 +0200 (CEST) Date: Wed, 27 Aug 2025 13:57:58 +0200 From: Wolfgang Bumiller To: Shan Shaji Message-ID: References: <20250825132103.225192-1-s.shaji@proxmox.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20250825132103.225192-1-s.shaji@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1756295873668 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.075 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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] applied: [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: pbs-devel@lists.proxmox.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" applied, thanks On Mon, Aug 25, 2025 at 03:21:03PM +0200, Shan Shaji wrote: > 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