PVE/Subscription.pm - check if we have a key

[pve-common.git] / src / PVE / Subscription.pm

diff --git a/src/PVE/Subscription.pm b/src/PVE/Subscription.pm
index 8de1c027965064e501bcaadfbbc13bd329c92072..15711524f570bb9bd5643a3de3463b55004d38ad 100644 (file)
--- a/src/PVE/Subscription.pm
+++ b/src/PVE/Subscription.pm
@@ -154,7 +154,7 @@ sub read_subscription {
        $data .= $line;
     }
 
-    if ($csum && $data) {
+    if ($key && $csum && $data) {
 
        chomp $csum;
 
@@ -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;
        }