[pve-devel] [PATCH storage 1/2] prune_backups: fix message

[pve-devel] [PATCH storage 1/2] prune_backups: fix message

[Fabian Ebner]

For prune selections, it doesn't matter what the current time is,
only the timestamps of the backups matter.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---

Sorry for missing this when I sent the series.

 PVE/API2/Storage/PruneBackups.pm | 5 ++---
 PVE/CLI/pvesm.pm                 | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/PVE/API2/Storage/PruneBackups.pm b/PVE/API2/Storage/PruneBackups.pm
index a84d1c8..2509a46 100644
--- a/PVE/API2/Storage/PruneBackups.pm
+++ b/PVE/API2/Storage/PruneBackups.pm
@@ -16,9 +16,8 @@ __PACKAGE__->register_method ({
     name => 'dryrun',
     path => '',
     method => 'GET',
-    description => "Get prune information for backups. NOTE: this is only a preview and might not be exactly " .
-		   "what a subsequent prune call does, if the hour changes or if backups are removed/added " .
-		   "in the meantime.",
+    description => "Get prune information for backups. NOTE: this is only a preview and might not be " .
+		   "what a subsequent prune call does if backups are removed/added in the meantime.",
     permissions => {
 	check => ['perm', '/storage/{storage}', ['Datastore.Audit', 'Datastore.AllocateSpace'], any => 1],
     },
diff --git a/PVE/CLI/pvesm.pm b/PVE/CLI/pvesm.pm
index cc03e37..93ef977 100755
--- a/PVE/CLI/pvesm.pm
+++ b/PVE/CLI/pvesm.pm
@@ -932,8 +932,8 @@ our $cmddef = {
 
 	return if !$dryrun;
 
-	print "NOTE: this is only a preview and might not be exactly what a subsequent prune call does,\n" .
-	      "if the hour changes or if backups are removed/added in the meantime.\n\n";
+	print "NOTE: this is only a preview and might not be what a subsequent\n" .
+	      "prune call does if backups are removed/added in the meantime.\n\n";
 
 	my @sorted = sort {
 	    my $vmcmp = PVE::Tools::safe_compare($a->{vmid}, $b->{vmid}, sub { $_[0] <=> $_[1] });
-- 
2.20.1

[pve-devel] [PATCH storage 2/2] prune_backups CLI: print different message when there's no backups at all

[Fabian Ebner]

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---

Otherwise it looks strange IMHO

 PVE/CLI/pvesm.pm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/PVE/CLI/pvesm.pm b/PVE/CLI/pvesm.pm
index 93ef977..caac51b 100755
--- a/PVE/CLI/pvesm.pm
+++ b/PVE/CLI/pvesm.pm
@@ -932,6 +932,11 @@ our $cmddef = {
 
 	return if !$dryrun;
 
+	if (!scalar(@{$list})) {
+	    print "No backups found\n";
+	    return;
+	}
+
 	print "NOTE: this is only a preview and might not be what a subsequent\n" .
 	      "prune call does if backups are removed/added in the meantime.\n\n";
 
-- 
2.20.1

[pve-devel] applied-series: [PATCH storage 1/2] prune_backups: fix message

[Thomas Lamprecht]

On 20.08.20 13:50, Fabian Ebner wrote:
> For prune selections, it doesn't matter what the current time is,
> only the timestamps of the backups matter.
> 
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> 
> Sorry for missing this when I sent the series.
> 
>  PVE/API2/Storage/PruneBackups.pm | 5 ++---
>  PVE/CLI/pvesm.pm                 | 4 ++--
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
>

applied series, thanks!