[taler-anastasis] branch master updated: do not upgrade gana to master on bootstrap (see #6839)

[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 c1bb4d2  do not upgrade gana to master on bootstrap (see #6839)
c1bb4d2 is described below

commit c1bb4d27bfc50877dc1d7f8a1959d8dd09f7f0ac
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Apr 9 16:36:43 2021 +0200

    do not upgrade gana to master on bootstrap (see #6839)
---
 bootstrap       | 3 ++-
 contrib/gana.sh | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/bootstrap b/bootstrap
index 92369ef..a7414cd 100755
--- a/bootstrap
+++ b/bootstrap
@@ -8,8 +8,9 @@ fi
 echo "$0: Updating submodules"
 echo | git submodule update --init
 
-./contrib/gana.sh
+git submodule update --init
 
+./contrib/gana-update.sh
 
 # This is more portable than `which' but comes with
 # the caveat of not(?) properly working on busybox's ash:
diff --git a/contrib/gana.sh b/contrib/gana.sh
index 1055d77..30dc799 100755
--- a/contrib/gana.sh
+++ b/contrib/gana.sh
@@ -3,10 +3,8 @@
 # Run from exchange/ main directory.
 set -eu
 
-git submodule update --init
-
 cd contrib/gana
 git pull origin master
 cd ../..
 
-./contrib/gana-update.sh
+exec ./contrib/gana-update.sh

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