From 554cce0c4c3f575f0f1f23f7476e9606812573db Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 3 Oct 2017 12:02:45 +0200 Subject: [PATCH] PVE/Subscription.pm - avoid warn, and return error message instead --- src/PVE/Subscription.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/PVE/Subscription.pm b/src/PVE/Subscription.pm index 8de1c02..1fa933a 100644 --- a/src/PVE/Subscription.pm +++ b/src/PVE/Subscription.pm @@ -171,13 +171,12 @@ sub read_subscription { my $age = time() - $localinfo->{checktime}; my $maxage = ($localkeydays + $allowcheckfaildays)*60*60*24; - if ($localinfo->{status} eq 'Active' && $age > $maxage) { - $localinfo->{status} = 'Invalid'; - $localinfo->{message} = "subscription info too old"; - } + die "subscription info too old\n" + if ($localinfo->{status} eq 'Active') && ($age > $maxage); }; if (my $err = $@) { - warn $err; + chomp $err; + $info->{message} = $err; } else { $info = $localinfo; } -- 2.39.2