From ceaa83b83edb069ecf1cca181ec461519f0cc020 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 26 Feb 2020 14:19:54 +0100
Subject: global-functions: merge $LogAnd{Error,Put} to $LogPrintExit ...

... and fix logging.

Logging with severity from variable (:log $severity ...) is not
possible, this is considered a syntax error. Also the 'workaround' with
parsing code failed with missing message in log.

The reliable code is a lot longer, so merge the two functions to save a
lot of duplicate code.
---
 upload-backup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'upload-backup')

diff --git a/upload-backup b/upload-backup
index 817a088..fb9f9cd 100644
--- a/upload-backup
+++ b/upload-backup
@@ -16,11 +16,11 @@
 :global CharacterReplace;
 :global DeviceInfo;
 :global SendNotification;
-:global LogAndError;
+:global LogPrintExit;
 
 :if ($BackupSendBinary != true && \
      $BackupSendExport != true) do={
-  $LogAndError error ("Configured to send neither backup nor config export.");
+  $LogPrintExit error ("Configured to send neither backup nor config export.") true;
 }
 
 # filename based on identity
-- 
cgit v1.2.3-70-g09d2