mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-13 17:26:34 +00:00
fhem.pl: remove error message on -ignoreErr for YahooWeather / fhem.cfg.demo
git-svn-id: https://svn.fhem.de/fhem/trunk@12564 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
9e4b187e49
commit
f24370d064
@ -1807,7 +1807,7 @@ CommandDefine($$)
|
|||||||
my $ret = CallFn($name, "DefFn", \%hash,
|
my $ret = CallFn($name, "DefFn", \%hash,
|
||||||
$modules{$m}->{parseParams} ? parseParams($def) : $def);
|
$modules{$m}->{parseParams} ? parseParams($def) : $def);
|
||||||
if($ret) {
|
if($ret) {
|
||||||
Log 1, "define $def: $ret";
|
Log 1, "define $def: $ret" if(!$ignoreErr);
|
||||||
delete $defs{$name}; # Veto
|
delete $defs{$name}; # Veto
|
||||||
delete $attr{$name};
|
delete $attr{$name};
|
||||||
|
|
||||||
@ -1824,7 +1824,8 @@ CommandDefine($$)
|
|||||||
addStructChange("define", $name, $def);
|
addStructChange("define", $name, $def);
|
||||||
DoTrigger("global", "DEFINED $name", 1) if($init_done);
|
DoTrigger("global", "DEFINED $name", 1) if($init_done);
|
||||||
}
|
}
|
||||||
return $ret;
|
return ($ret && $ignoreErr ?
|
||||||
|
"Cannot define $name, remove -ignoreErr for details" : $ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
#####################################
|
#####################################
|
||||||
|
Loading…
x
Reference in New Issue
Block a user