From 142b0760b0e8daa205cc1fc8f471716e219ece82 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 8 May 2025 09:17:46 +0200
Subject: [PATCH] fw-addr-lists: :do ... on-error=... -> :onerror ... do=...

---
 fw-addr-lists.rsc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/fw-addr-lists.rsc b/fw-addr-lists.rsc
index 4ee3c34..659fb2f 100644
--- a/fw-addr-lists.rsc
+++ b/fw-addr-lists.rsc
@@ -176,13 +176,13 @@
       :foreach Address,Timeout in=$Branch do={
         $LogPrintVerbose debug $ScriptName ("Adding IPv4 address to list '" . $FwListName . \
             "' with " . $Timeout . ": " . $Address);
-        :do {
+        :onerror Err {
           /ip/firewall/address-list/add list=$FwListName comment=$ListComment \
               address=$Address timeout=$Timeout;
           :set CntAdd ($CntAdd + 1);
-        } on-error={
-          $LogPrint warning $ScriptName ("Failed to add IPv4 address to list '" . $FwListName . \
-              "': " . $Address);
+        } do={
+          $LogPrint warning $ScriptName ("Failed to add IPv4 address " . $Address . \
+              " to list '" . $FwListName . "': " . $Err);
         }
       }
     }
@@ -192,13 +192,13 @@
       :foreach Address,Timeout in=$Branch do={
         $LogPrintVerbose debug $ScriptName ("Adding IPv6 address to list '" . $FwListName . \
             "' with " . $Timeout . ": " . $Address);
-        :do {
+        :onerror Err {
           /ipv6/firewall/address-list/add list=$FwListName comment=$ListComment \
               address=$Address timeout=$Timeout;
           :set CntAdd ($CntAdd + 1);
-        } on-error={
-          $LogPrint warning $ScriptName ("Failed to add IPv6 address to list '" . $FwListName . \
-              "': " . $Address);
+        } do={
+          $LogPrint warning $ScriptName ("Failed to add IPv6 address " . $Address . \
+              " to list '" . $FwListName . "': " . $Err);
         }
       }
     }