[taler-merchant] branch master updated: tolerate missing currencies.conf

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 99fbce18 tolerate missing currencies.conf
99fbce18 is described below

commit 99fbce18348051b8a9ac8d7c887417d95d6dbee0
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Fri Dec 15 16:50:26 2023 +0800

    tolerate missing currencies.conf
---
 contrib/wallet-core                | 2 +-
 debian/changelog                   | 7 +++++++
 doc/prebuilt                       | 2 +-
 src/backend/taler-merchant-httpd.c | 3 ++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/contrib/wallet-core b/contrib/wallet-core
index ec95723a..2347be69 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit ec95723a68d36620aa66109c329437612383830b
+Subproject commit 2347be694c713959528ad59f3f157d866d7ad424
diff --git a/debian/changelog b/debian/changelog
index 5e76aedd..ecd3e21c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+taler-merchant (0.9.3-5) unstable; urgency=low
+
+  * Tolerate missing currencies.conf, but log a warning.
+  * Use taler-merchant as default database name.
+
+ -- Christian Grothoff <grothoff@gnu.org>  Tue, 15 Dec 2023 18:50:12 -0700
+
 taler-merchant (0.9.3-4) unstable; urgency=low
 
   * More fixes to the database setup automation scripts.
diff --git a/doc/prebuilt b/doc/prebuilt
index 5e47a72e..09a33a50 160000
--- a/doc/prebuilt
+++ b/doc/prebuilt
@@ -1 +1 @@
-Subproject commit 5e47a72e8a2b5086dfdae4078f695155f5ed7af8
+Subproject commit 09a33a50d9b3b400f8a515082c888918cbf4e1b5
diff --git a/src/backend/taler-merchant-httpd.c 
b/src/backend/taler-merchant-httpd.c
index 3a8a9412..d484252c 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -2189,10 +2189,11 @@ run (void *cls,
   GNUNET_CURL_enable_async_scope_header (TMH_curl_ctx,
                                          "Taler-Correlation-Id");
 
-  if (GNUNET_OK !=
+  if (GNUNET_SYSERR ==
       TALER_config_get_currency (cfg,
                                  &TMH_currency))
   {
+    
     GNUNET_SCHEDULER_shutdown ();
     return;
   }

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.