public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Alexander Zeidler <a.zeidler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager] pveversion: show upgradable package version in verbose output
Date: Thu, 18 Apr 2024 09:44:06 +0200	[thread overview]
Message-ID: <20240418074406.22025-4-a.zeidler@proxmox.com> (raw)

when the state is "Installed", including not correctly installed, but
not for (residual) "ConfigFiles".

The information
* can be inaccurate for offline nodes or when using POM.
* is included in pveversion so it can also be used on public channels
  like the forum. The current System Report includes pveversion -v

 # pveversion -v
 proxmox-ve: 8.1.0 (running kernel: 6.5.13-5-pve)
 pve-manager: 8.1.6 (running version: 8.1.6/b7e8e914a1db70cc) [available: 8.1.10]
 ...
 vncterm: 1.8.0
 zfsutils-linux: 2.2.3-pve1 [available: 2.2.3-pve2]

Signed-off-by: Alexander Zeidler <a.zeidler@proxmox.com>
---
 bin/pveversion | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/bin/pveversion b/bin/pveversion
index 591f63e7..b98e1096 100755
--- a/bin/pveversion
+++ b/bin/pveversion
@@ -21,19 +21,29 @@ sub print_status {
 	print "$pkg: unknown package - internal error\n";
 	return;
     }
+
+    my $installed = $pkginfo->{CurrentState} eq 'Installed';
+    my $upgradable = $pkginfo->{OldVersion} && ($pkginfo->{OldVersion} ne $pkginfo->{Version});
+
     my $version = "not correctly installed";
-    if ($pkginfo->{OldVersion} && $pkginfo->{CurrentState} eq 'Installed') {
+    if ($installed && $pkginfo->{OldVersion}) {
 	$version = $pkginfo->{OldVersion};
     } elsif ($pkginfo->{CurrentState} eq 'ConfigFiles') {
 	$version = 'residual config';
     }
 
     if ($pkginfo->{RunningKernel}) {
-	print "$pkg: $version (running kernel: $pkginfo->{RunningKernel})\n";
+	print "$pkg: $version (running kernel: $pkginfo->{RunningKernel})";
     } elsif ($pkginfo->{ManagerVersion}) {
-	print "$pkg: $version (running version: $pkginfo->{ManagerVersion})\n";
+	print "$pkg: $version (running version: $pkginfo->{ManagerVersion})";
+    } else {
+	print "$pkg: $version";
+    }
+
+    if ($installed && $upgradable) {
+	print " [available: " . $pkginfo->{Version} . "]\n";
     } else {
-	print "$pkg: $version\n";
+	print "\n";
     }
 }
 
@@ -50,7 +60,7 @@ my $opt_verbose;
 if (!GetOptions ('verbose' => \$opt_verbose)) {
     print_usage ();
     exit (-1);
-} 
+}
 
 if (scalar (@ARGV) != 0) {
     print_usage ();
@@ -76,7 +86,7 @@ __END__
 
 =head1 NAME
 
-pveversion - Proxmox  VE version info
+pveversion - Proxmox VE version info
 
 =head1 SYNOPSIS
 
-- 
2.39.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


             reply	other threads:[~2024-04-18  7:44 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-18  7:44 Alexander Zeidler [this message]
2024-04-18  8:31 ` Stefan Sterz

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=20240418074406.22025-4-a.zeidler@proxmox.com \
    --to=a.zeidler@proxmox.com \
    --cc=pve-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