From 44284774a11bfce46448a0b3c81c109ccaa58c0c Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Fri, 13 Nov 2015 16:33:50 +0000 Subject: [PATCH] fhem.pl: better error reporting for ReplaceSetMagic (>= 5.7) git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9880 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/fhem.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fhem/fhem.pl b/fhem/fhem.pl index 01a0bf41b..c65447957 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -1513,11 +1513,11 @@ ReplaceSetMagic(@) # Forum #38276 $a =~ s/{\((.*)\)}/{ my $x = eval $1; - Log 1, "ReplaceSetMagic: $1 -> $@" if($@); + return ("$1: $@") if($@); $@ ? $1 : $x }/eg; - return split(" ", $a); + return (undef, split(" ", $a)); } ##################################### @@ -1536,7 +1536,9 @@ DoSet(@) return CallFn($dev, "SetFn", $hash, @a) if($a[1] && $a[1] eq "?"); @a = ReplaceEventMap($dev, \@a, 0) if($attr{$dev}{eventMap}); - @a = ReplaceSetMagic(@a) if($featurelevel >= 5.7); + my $err; + ($err, @a) = ReplaceSetMagic(@a) if($featurelevel >= 5.7); + return $err if($err); $hash->{".triggerUsed"} = 0; my ($ret, $skipTrigger) = CallFn($dev, "SetFn", $hash, @a);