diff options
| author | priscilla <priscilla.huang@efrei.net> | 2023-01-30 09:54:45 -0500 |
|---|---|---|
| committer | priscilla <priscilla.huang@efrei.net> | 2023-01-30 09:54:45 -0500 |
| commit | 05f43c2ad20c30c8091318ec0c8587515c4971bc (patch) | |
| tree | dea832d79c9f7cfcb68cfe982ffc081eac63b4b0 | |
| parent | 60e77f622c825b81e663f4b97af2a8f98ef995bb (diff) | |
update
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-templates.c | 4 | ||||
| -rw-r--r-- | src/backend/taler-merchant-httpd_private-post-webhooks.c | 2 | ||||
| -rwxr-xr-x | src/backend/taler-merchant-webhook | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/taler-merchant-httpd_private-post-templates.c b/src/backend/taler-merchant-httpd_private-post-templates.c index 770f8730..9cc33eaa 100644 --- a/src/backend/taler-merchant-httpd_private-post-templates.c +++ b/src/backend/taler-merchant-httpd_private-post-templates.c @@ -48,9 +48,9 @@ templates_equal (const struct TALER_MERCHANTDB_TemplateDetails *t1, return ( (0 == strcmp (t1->template_description, t2->template_description)) && ( ( (NULL == t1->image) && (NULL == t2->image) ) || - ( (NULL != t1->image) && (NULL != t2->image) ) && + ( (NULL != t1->image) && (NULL != t2->image) && (0 == strcmp (t1->image, - t2->image)) ) && + t2->image)) ) ) && (1 == json_equal (t1->template_contract, t2->template_contract)) ); } diff --git a/src/backend/taler-merchant-httpd_private-post-webhooks.c b/src/backend/taler-merchant-httpd_private-post-webhooks.c index 794ede35..a7b90b0d 100644 --- a/src/backend/taler-merchant-httpd_private-post-webhooks.c +++ b/src/backend/taler-merchant-httpd_private-post-webhooks.c @@ -62,7 +62,7 @@ webhooks_equal (const struct TALER_MERCHANTDB_WebhookDetails *w1, ( (NULL != w1->body_template) && (NULL != w2->body_template) && (0 == strcmp (w1->body_template, - w2->body_template)) ) ) ); + w2->body_template)) ) ) ); } diff --git a/src/backend/taler-merchant-webhook b/src/backend/taler-merchant-webhook index 57ebb275..880c8c6d 100755 --- a/src/backend/taler-merchant-webhook +++ b/src/backend/taler-merchant-webhook @@ -1,7 +1,7 @@ #! /bin/bash # taler-merchant-webhook - temporary wrapper script for .libs/taler-merchant-webhook -# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-15build2 +# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-15 # # The taler-merchant-webhook program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -90,7 +90,7 @@ func_parse_lt_options () # Print the debug banner immediately: if test -n "$lt_option_debug"; then - echo "taler-merchant-webhook:taler-merchant-webhook:$LINENO: libtool wrapper (GNU libtool) 2.4.6 Debian-2.4.6-15build2" 1>&2 + echo "taler-merchant-webhook:taler-merchant-webhook:$LINENO: libtool wrapper (GNU libtool) 2.4.6 Debian-2.4.6-15" 1>&2 fi } @@ -188,7 +188,7 @@ func_exec_program () if test -f "$progdir/$program"; then # Add our own library path to LD_LIBRARY_PATH - LD_LIBRARY_PATH="/home/grothoff/research/merchant/src/backenddb/.libs:/home/grothoff/lib:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="/home/priscilla/merchant/src/backenddb/.libs:/home/priscilla/install/lib:$LD_LIBRARY_PATH" # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH # The second colon is a workaround for a bug in BeOS R4 sed |