diff options
author | Christian Hesse <mail@eworm.de> | 2024-12-06 12:17:47 +0100 |
---|---|---|
committer | Christian Hesse <mail@eworm.de> | 2024-12-09 11:49:50 +0100 |
commit | 3866ea19235e467a3e16cc627ab2dccca3db3a2c (patch) | |
tree | 3c5fa83bc0a13f5be94e677568357840e98115e1 /capsman-download-packages.capsman.rsc | |
parent | 48bcf8ee6e92445b01f792f1c52af012ba05b7b4 (diff) | |
parent | ee030740cba5bd0c8b0c9c3e77551dd460abe48b (diff) |
Merge branch 'exit-error' into next
Diffstat (limited to 'capsman-download-packages.capsman.rsc')
-rw-r--r-- | capsman-download-packages.capsman.rsc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/capsman-download-packages.capsman.rsc b/capsman-download-packages.capsman.rsc index f2ff024..1802884 100644 --- a/capsman-download-packages.capsman.rsc +++ b/capsman-download-packages.capsman.rsc @@ -14,6 +14,7 @@ :global GlobalFunctionsReady; :while ($GlobalFunctionsReady != true) do={ :delay 500ms; } +:local ExitOK false; :do { :local ScriptName [ :jobname ]; @@ -25,6 +26,7 @@ :global WaitFullyConnected; :if ([ $ScriptLock $ScriptName ] = false) do={ + :set ExitOK true; :error false; } $WaitFullyConnected; @@ -35,6 +37,7 @@ :if ([ :len $PackagePath ] = 0) do={ $LogPrint warning $ScriptName ("The CAPsMAN package path is not defined, can not download packages."); + :set ExitOK true; :error false; } @@ -42,6 +45,7 @@ :if ([ $MkDir $PackagePath ] = false) do={ $LogPrint warning $ScriptName ("Creating directory at CAPsMAN package path (" . \ $PackagePath . ") failed!"); + :set ExitOK true; :error false; } $LogPrint info $ScriptName ("Created directory at CAPsMAN package path (" . $PackagePath . \ @@ -82,4 +86,6 @@ /caps-man/remote-cap/upgrade [ find where version!=$InstalledVersion ]; } } -} on-error={ } +} on-error={ + :global ExitError; $ExitError $ExitOK [ :jobname ]; +} |