From 9f5f717d45c7e84b4900549aaf758a924de7482a Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Mon, 30 Mar 2020 20:30:11 +0000 Subject: [PATCH] fhem.pl: attr -a/-r exclusive handling (Forum #109678) git-svn-id: https://svn.fhem.de/fhem/trunk@21547 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/fhem.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fhem/fhem.pl b/fhem/fhem.pl index 60a509414..891956aa1 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -2873,7 +2873,7 @@ CommandAttr($$) @a = split(" ", $param, 3) if($param); return "Usage: attr [-a|-r] []\n$namedef" - if(@a && @a < 2); + if(@a < 2); my $a1 = $a[1]; return "$a[0]: bad attribute name '$a1' (allowed chars: A-Za-z/\\d_\\.-)" if($featurelevel > 5.9 && !goodReadingName($a1) && $a1 ne "?"); @@ -2917,11 +2917,12 @@ CommandAttr($$) if($append && $attr{$sdev} && $attr{$sdev}{$attrName}) { $attrVal = $attr{$sdev}{$attrName} . ($attrVal =~ m/^,/ ? $attrVal : " $attrVal"); - } - if($remove && $attr{$sdev} && $attr{$sdev}{$attrName}) { + + } elsif($remove && $attr{$sdev} && $attr{$sdev}{$attrName}) { my $v = $attr{$sdev}{$attrName}; $v =~ s/\b$attrVal\b//; $attrVal = $v; + } if($attrName eq 'disable' && $attrVal eq 'toggle') {