From 35af6f86e9627e4b44cb959a1246c06f7a133b50 Mon Sep 17 00:00:00 2001
From: jpawlowski <jpawlowski@users.noreply.github.com>
Date: Tue, 26 Feb 2019 10:22:20 +0000
Subject: [PATCH] Meta.pm: fix error handling

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@18741 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/Meta.pm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/FHEM/Meta.pm b/FHEM/Meta.pm
index 77429b73a..02020158f 100644
--- a/FHEM/Meta.pm
+++ b/FHEM/Meta.pm
@@ -480,12 +480,9 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
         $encoding = 'latin1' unless ($encoding);
 
         if ( keys %json > 0 ) {
-            eval {
-                use JSON;
-                1;
-            };
+            eval "use JSON;";
 
-            unless ($@) {
+            if ( !$@ ) {
                 foreach ( keys %json ) {
                     next
                       if (
@@ -530,6 +527,9 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
                 }
                 return undef if ($metaSection);
             }
+            else {
+                $@ = undef;
+            }
         }
 
         # special place for fhem.pl is this module file
@@ -545,12 +545,9 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
 
         # Detect prereqs if not provided via META.json
         if ( !defined( $modMeta->{prereqs} ) ) {
-            eval {
-                use Perl::PrereqScanner::NotQuiteLite;
-                1;
-            };
+            eval "use Perl::PrereqScanner::NotQuiteLite;";
 
-            unless ($@) {
+            if ( !$@ ) {
                 my $scanner = Perl::PrereqScanner::NotQuiteLite->new(
                     parsers  => [qw/:installed -UniversalVersion/],
                     suggests => 1,
@@ -613,6 +610,9 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
                     }
                 }
             }
+            else {
+                $@ = undef;
+            }
         }
         else {
             $modMeta->{x_prereqs_src} = 'META.json';
@@ -857,7 +857,7 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
     "metadata",
     "meta"
   ],
-  "version": "v0.1.0",
+  "version": "v0.1.1",
   "release_status": "testing",
   "author": [
     "Julian Pawlowski <julian.pawlowski@gmail.com>"