[taler-anastasis] branch master updated: fix

[gnunet]

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

grothoff pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new 06f0fe9  fix
06f0fe9 is described below

commit 06f0fe9bb4dddd2b22bcbf8be31f6a09ce0aade2
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Apr 24 17:52:07 2020 +0200

    fix
---
 src/backend/anastasis-httpd_policy_upload.c |  4 +-
 src/lib/test_anastasis                      | 62 ++++++++++-------------------
 2 files changed, 25 insertions(+), 41 deletions(-)

diff --git a/src/backend/anastasis-httpd_policy_upload.c 
b/src/backend/anastasis-httpd_policy_upload.c
index 07ca302..f13d809 100644
--- a/src/backend/anastasis-httpd_policy_upload.c
+++ b/src/backend/anastasis-httpd_policy_upload.c
@@ -296,7 +296,9 @@ proposal_cb (void *cls,
                 (int) hr->ec);
     GNUNET_break (0);
     puc->resp = TALER_MHD_make_json_pack (
-      "{s:I, s:s, s:I, s:I, s:O}",
+      (NULL == hr->reply)
+      ? "{s:I, s:s, s:I, s:I}"
+      : "{s:I, s:s, s:I, s:I, s:O}",
       "code",
       (json_int_t) TALER_EC_SYNC_PAYMENT_CREATE_BACKEND_ERROR,
       "hint",
diff --git a/src/lib/test_anastasis b/src/lib/test_anastasis
index 3348625..82d49c8 100755
--- a/src/lib/test_anastasis
+++ b/src/lib/test_anastasis
@@ -1,7 +1,7 @@
-#! /bin/sh
+#! /bin/bash
 
 # test_anastasis - temporary wrapper script for .libs/test_anastasis
-# Generated by libtool (GNU libtool) 2.4.6.42-b88ce-dirty
+# Generated by libtool (GNU libtool) 2.4.6 Debian-2.4.6-9
 #
 # The test_anastasis program cannot be directly executed until all the libtool
 # libraries that it depends on are installed.
@@ -31,13 +31,13 @@ DUALCASE=1; export DUALCASE # for MKS sh
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-relink_command="(cd 
/home/dennis/Nextcloud/Studium-BFH/Aktuell_FS2020/Bachelor-Thesis/ANASTASIS/anastasis/src/lib;
 { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; 
export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset 
COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z 
\"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; 
export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN 
[...]
+relink_command=""
 
 # This environment variable determines our operation mode.
 if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
   # install mode needs the following variables:
-  generated_by_libtool_version='2.4.6.42-b88ce-dirty'
-  notinst_deplibs=' ../../src/stasis/libanastasisdb.la libanastasis.la 
libanastasistesting.la 
/home/dennis/Nextcloud/Studium-BFH/Aktuell_FS2020/Bachelor-Thesis/ANASTASIS/anastasis/src/lib/libanastasisrest.la'
+  generated_by_libtool_version='2.4.6'
+  notinst_deplibs=' ../../src/stasis/libanastasisdb.la libanastasis.la 
libanastasistesting.la'
 else
   # When we are sourced in execute mode, $file and $ECHO are already set.
   if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
@@ -75,9 +75,9 @@ func_parse_lt_options ()
     case "$lt_opt" in
     --lt-debug) lt_option_debug=1 ;;
     --lt-dump-script)
-        lt_dump_D=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 
's%/[^/]*$%%'`
+        lt_dump_D=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 
's%/[^/]*$%%'`
         test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
-        lt_dump_F=`$ECHO "X$lt_script_arg0" | /usr/bin/sed -e 's/^X//' -e 
's%^.*/%%'`
+        lt_dump_F=`$ECHO "X$lt_script_arg0" | /bin/sed -e 's/^X//' -e 
's%^.*/%%'`
         cat "$lt_dump_D/$lt_dump_F"
         exit 0
       ;;
@@ -90,7 +90,7 @@ func_parse_lt_options ()
 
   # Print the debug banner immediately:
   if test -n "$lt_option_debug"; then
-    echo "test_anastasis:test_anastasis:$LINENO: libtool wrapper (GNU libtool) 
2.4.6.42-b88ce-dirty" 1>&2
+    echo "test_anastasis:test_anastasis:$LINENO: libtool wrapper (GNU libtool) 
2.4.6 Debian-2.4.6-9" 1>&2
   fi
 }
 
@@ -143,13 +143,13 @@ func_exec_program ()
   func_parse_lt_options "$0" ${1+"$@"}
 
   # Find the directory that this script lives in.
-  thisdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+  thisdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'`
   test "x$thisdir" = "x$file" && thisdir=.
 
   # Follow symbolic links until we get to the real thisdir.
-  file=`ls -ld "$file" | /usr/bin/sed -n 's/.*-> //p'`
+  file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
   while test -n "$file"; do
-    destdir=`$ECHO "$file" | /usr/bin/sed 's%/[^/]*$%%'`
+    destdir=`$ECHO "$file" | /bin/sed 's%/[^/]*$%%'`
 
     # If there was a directory component, then change thisdir.
     if test "x$destdir" != "x$file"; then
@@ -159,8 +159,8 @@ func_exec_program ()
       esac
     fi
 
-    file=`$ECHO "$file" | /usr/bin/sed 's%^.*/%%'`
-    file=`ls -ld "$thisdir/$file" | /usr/bin/sed -n 's/.*-> //p'`
+    file=`$ECHO "$file" | /bin/sed 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
   done
 
   # Usually 'no', except on cygwin/mingw when embedded into
@@ -173,7 +173,7 @@ func_exec_program ()
     fi
     # remove .libs from thisdir
     case "$thisdir" in
-    *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /usr/bin/sed 
's%[\\/][^\\/]*$%%'` ;;
+    *[\\/].libs ) thisdir=`$ECHO "$thisdir" | /bin/sed 's%[\\/][^\\/]*$%%'` ;;
     .libs )   thisdir=. ;;
     esac
   fi
@@ -182,38 +182,20 @@ func_exec_program ()
   absdir=`cd "$thisdir" && pwd`
   test -n "$absdir" && thisdir="$absdir"
 
-  program=lt-'test_anastasis'
+  program='test_anastasis'
   progdir="$thisdir/.libs"
 
-  if test ! -f "$progdir/$program" ||
-     { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | 
/usr/bin/sed 1q`; \
-       test "X$file" != "X$progdir/$program"; }; then
 
-    file="$$-$program"
+  if test -f "$progdir/$program"; then
+    # Add our own library path to LD_LIBRARY_PATH
+    
LD_LIBRARY_PATH="/home/grothoff/research/taler/anastasis/src/stasis/.libs:/home/grothoff/research/taler/anastasis/src/lib/.libs:/home/grothoff/lib:/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH"
 
-    if test ! -d "$progdir"; then
-      mkdir "$progdir"
-    else
-      rm -f "$progdir/$file"
-    fi
+    # Some systems cannot cope with colon-terminated LD_LIBRARY_PATH
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    LD_LIBRARY_PATH=`$ECHO "$LD_LIBRARY_PATH" | /bin/sed 's/::*$//'`
 
-    # relink executable if necessary
-    if test -n "$relink_command"; then
-      if relink_command_output=`eval $relink_command 2>&1`; then :
-      else
-       $ECHO "$relink_command_output" >&2
-       rm -f "$progdir/$file"
-       exit 1
-      fi
-    fi
+    export LD_LIBRARY_PATH
 
-    mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
-    { rm -f "$progdir/$program";
-      mv -f "$progdir/$file" "$progdir/$program"; }
-    rm -f "$progdir/$file"
-  fi
-
-  if test -f "$progdir/$program"; then
     if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
       # Run the actual program with our arguments.
       func_exec_program ${1+"$@"}

-- 
To stop receiving notification emails like this one, please contact
address@hidden.