collect-wireless-mac: use :onerror for outer block

This commit is contained in:
Christian Hesse 2025-05-06 09:44:23 +02:00
parent 472dc9289d
commit 7d8e9fda29
4 changed files with 12 additions and 12 deletions

View file

@ -15,7 +15,7 @@
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local ExitOK false; :local ExitOK false;
:do { :onerror Err {
:local ScriptName [ :jobname ]; :local ScriptName [ :jobname ];
:global Identity; :global Identity;
@ -95,6 +95,6 @@
$LogPrint debug $ScriptName ("No mac address available... Ignoring."); $LogPrint debug $ScriptName ("No mac address available... Ignoring.");
} }
} }
} on-error={ } do={
:global ExitError; $ExitError $ExitOK [ :jobname ]; :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
} }

View file

@ -15,7 +15,7 @@
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local ExitOK false; :local ExitOK false;
:do { :onerror Err {
:local ScriptName [ :jobname ]; :local ScriptName [ :jobname ];
:global Identity; :global Identity;
@ -96,6 +96,6 @@
$LogPrint debug $ScriptName ("No mac address available... Ignoring."); $LogPrint debug $ScriptName ("No mac address available... Ignoring.");
} }
} }
} on-error={ } do={
:global ExitError; $ExitError $ExitOK [ :jobname ]; :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
} }

View file

@ -16,7 +16,7 @@
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local ExitOK false; :local ExitOK false;
:do { :onerror Err {
:local ScriptName [ :jobname ]; :local ScriptName [ :jobname ];
:global Identity; :global Identity;
@ -113,6 +113,6 @@
$LogPrint debug $ScriptName ("No mac address available... Ignoring."); $LogPrint debug $ScriptName ("No mac address available... Ignoring.");
} }
} }
} on-error={ } do={
:global ExitError; $ExitError $ExitOK [ :jobname ]; :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
} }

View file

@ -15,7 +15,7 @@
:while ($GlobalFunctionsReady != true) do={ :delay 500ms; } :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
:local ExitOK false; :local ExitOK false;
:do { :onerror Err {
:local ScriptName [ :jobname ]; :local ScriptName [ :jobname ];
:global Identity; :global Identity;
@ -95,6 +95,6 @@
$LogPrint debug $ScriptName ("No mac address available... Ignoring."); $LogPrint debug $ScriptName ("No mac address available... Ignoring.");
} }
} }
} on-error={ } do={
:global ExitError; $ExitError $ExitOK [ :jobname ]; :global ExitError; $ExitError $ExitOK [ :jobname ] $Err;
} }