Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2024-06-17 05:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_archetype: fix perl evaluation for actual_attr

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@20798 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
igami 2019-12-22 06:49:26 +00:00
parent ccb3a50a7c
commit 50c6553573
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FHEM/98_archetype.pm
View File

@ -515,6 +515,10 @@ sub archetype_attrCheck($$$$;$) {
return if(AttrVal($name, "attributesExclude", "") =~ /$attribute/);
if(AttrVal($SELF, "actual_$attribute", undef)){
$desired = eval($desired) if($desired =~ m/^\{.*\}$/);
$desired = archetype_evalSpecials($name, $desired) if($desired =~ m/%/);
}
if($desired =~ m/^least(\((.*)\))?:(.+)/){
my $seperator = $2 ? $2 : " ";
@ -527,11 +531,6 @@ sub archetype_attrCheck($$$$;$) {
$desired = (split(":", $desired, 2))[1];
}
if($hash->{DEF} eq "derive attributes"){
$desired = eval($desired) if($desired =~ m/^\{.*\}$/);
$desired = archetype_evalSpecials($name, $desired) if($desired =~ m/%/);
}
return unless($desired);
if($actual ne $desired){