public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Shan Shaji <s.shaji@proxmox.com>
To: pbs-devel@lists.proxmox.com
Cc: Shan Shaji <s.shaji@proxmox.com>
Subject: [pbs-devel] [PATCH proxmox-backup] fix #6624: ui: improve task log output for protected entry
Date: Fri, 22 Aug 2025 18:45:48 +0200	[thread overview]
Message-ID: <20250822164548.403860-1-s.shaji@proxmox.com> (raw)

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 <s.shaji@proxmox.com>
---
 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


             reply	other threads:[~2025-08-22 16:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-22 16:45 Shan Shaji [this message]
2025-08-25  9:47 ` Wolfgang Bumiller
2025-08-25 10:47   ` Shan Shaji
2025-08-25 13:23   ` Shan Shaji

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=20250822164548.403860-1-s.shaji@proxmox.com \
    --to=s.shaji@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal