tfa: upgrade check: more info in error message(s)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm
index c5be63bc8b49867f642dcdfe5b87837dbe2be9eb..33cf6f55a06d9445bda89894df25dba0a4af6a7d 100644 (file)
--- a/src/PVE/AccessControl.pm
+++ b/src/PVE/AccessControl.pm
@@ -1774,22 +1774,22 @@ sub assert_new_tfa_config_available() {
     foreach my $node (keys $members->%*) {
        my $info = $version_info->{$node};
        if (!$info) {
-           $old .= "cluster node '$node' is too old, did not broadcast its version info\n";
+           $old .= "  cluster node '$node' is too old, did not broadcast its version info\n";
            next;
        }
        $info = from_json($info);
        my $ver = $info->{version};
        if ($ver !~ /^(\d+\.\d+)-(\d+)/) {
-           $old .= "cluster node '$node' provided an invalid version string: '$ver'\n";
+           $old .= "  cluster node '$node' provided an invalid version string: '$ver'\n";
            next;
        }
        my ($maj, $rel) = ($1, $2);
        if (!($maj > 7.0 || ($maj == 7.0 && $rel >= 15))) {
-           $old .= "cluster node '$node' is too old\n";
+           $old .= "  cluster node '$node' is too old ($ver < 7.0-15)\n";
            next;
        }
     }
-    die $old if length($old);
+    die "cannot update tfa config, following nodes are not up to date:\n$old" if length($old);
 }
 
 sub user_remove_tfa : prototype($) {