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 983D01FF15C for ; Fri, 22 Aug 2025 18:46:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 774CF148EF; Fri, 22 Aug 2025 18:46:53 +0200 (CEST) From: Shan Shaji To: pbs-devel@lists.proxmox.com Date: Fri, 22 Aug 2025 18:45:48 +0200 Message-ID: <20250822164548.403860-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: 1755881178250 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.183 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] [PATCH proxmox-backup] 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' with 'Dry Run' gives incomplete task-log output for a 'protected' entry. To fix this, add an additional check to return the string 'would keep', since a protected entry is always kept. Signed-off-by: Shan Shaji --- src/server/prune_job.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/server/prune_job.rs b/src/server/prune_job.rs index 1c86647a..6108d32d 100644 --- a/src/server/prune_job.rs +++ b/src/server/prune_job.rs @@ -69,7 +69,15 @@ pub fn prune_datastore( let keep = keep_all || mark.keep(); info!( "{}{mark} {}/{}/{}", - if dry_run { "would " } else { "" }, + if dry_run { + if mark.protected() { + "would keep " + } else { + "would " + } + } else { + "" + }, group.backup_type(), group.backup_id(), info.backup_dir.backup_time_string() -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel