From e408e029f4d02a75398cb2021c24d8145b93b77c Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Tue, 6 Jul 2021 08:56:14 +0000
Subject: [PATCH] fhem.pl: add -silent to deleteattr (Forum #121936)

git-svn-id: https://svn.fhem.de/fhem/trunk@24706 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/docs/commandref_frame.html    |  2 +-
 fhem/docs/commandref_frame_DE.html |  2 +-
 fhem/fhem.pl                       | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/fhem/docs/commandref_frame.html b/fhem/docs/commandref_frame.html
index 79b288c06..a8adf9c95 100644
--- a/fhem/docs/commandref_frame.html
+++ b/fhem/docs/commandref_frame.html
@@ -843,7 +843,7 @@ The following local attributes are used by a wider range of devices:
 <a name="deleteattr"></a>
 <h3>deleteattr</h3>
 <ul>
-  <code>deleteattr &lt;devspec&gt; [&lt;attrname&gt;]</code> <br>
+  <code>deleteattr [-silent] &lt;devspec&gt; [&lt;attrname&gt;]</code> <br>
   <br>
   Delete either a single attribute (see the <a href="#attr">attr</a> command)
   or all attributes for a device (if no &lt;attrname&gt; is defined).
diff --git a/fhem/docs/commandref_frame_DE.html b/fhem/docs/commandref_frame_DE.html
index 510fe5cad..aa61efeab 100644
--- a/fhem/docs/commandref_frame_DE.html
+++ b/fhem/docs/commandref_frame_DE.html
@@ -866,7 +866,7 @@ Die folgenden lokalen Attribute werden von mehreren Ger&auml;ten verwendet:
 <a name="deleteattr"></a>
 <h3>deleteattr</h3>
 <ul>
-  <code>deleteattr &lt;devspec&gt; [&lt;attrname&gt;]</code> <br>
+  <code>deleteattr [-silent] &lt;devspec&gt; [&lt;attrname&gt;]</code> <br>
   <br>
   L&ouml;scht entweder ein einzelnes Attribut (siehe Abschnitt <a
   href="#attr">attr</a> ) oder alle Attribute eines Ger&auml;tes (falls
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index dd8635805..2740378b4 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -410,7 +410,7 @@ my %ra = (
 %cmds = (
   "?"       => { ReplacedBy => "help" },
   "attr"    => { Fn=>"CommandAttr",
-           Hlp=>"[-a] [-r] <devspec> <attrname> [<attrval>],".
+           Hlp=>"[-a] [-r] [-silent] <devspec> <attrname> [<attrval>],".
                 "set attribute for <devspec>"},
   "cancel"  => { Fn=>"CommandCancel",
            Hlp=>"[<id> [quiet]],list sleepers, cancel sleeper with <id>" },
@@ -421,7 +421,7 @@ my %ra = (
            Hlp=>"[-temporary] <name> <type> <options>,".
                 "define or modify a device" },
   "deleteattr" => { Fn=>"CommandDeleteAttr",
-           Hlp=>"<devspec> [<attrname>],delete attribute for <devspec>" },
+           Hlp=>"[-silent] <devspec> [<attrname>],delete attribute for <devspec>" },
   "deletereading" => { Fn=>"CommandDeleteReading",
             Hlp=>"<devspec> <readingname> [older-than-seconds],".
                  "delete user defined readings" },
@@ -2340,6 +2340,10 @@ CommandDeleteAttr($$)
 {
   my ($cl, $def) = @_;
 
+  my $optRegexp = '-silent';
+  my %opt;
+  $def = cmd_parseOpts($def, $optRegexp, \%opt);
+
   my @a = split(" ", $def, 2);
   return "Usage: deleteattr <name> [<attrname>]\n$namedef" if(@a < 1);
 
@@ -2378,7 +2382,7 @@ CommandDeleteAttr($$)
       }
 
     }
-    addStructChange("deleteAttr", $sdev, join(" ", @a));
+    addStructChange("deleteAttr", $sdev, join(" ", @a)) if(!$opt{silent});
     DoTrigger("global", "DELETEATTR ".join(" ",@a), 1) if($init_done);
 
   }