From d72816cfde668130a6f3c25d8be35232a4e92859 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 24 Jul 2020 12:43:33 +0200
Subject: fix #6431

---
 contrib/gana           |  2 +-
 contrib/gana-update.sh | 18 ++++++++++++++++++
 contrib/gana.sh        | 14 +-------------
 3 files changed, 20 insertions(+), 14 deletions(-)
 create mode 100755 contrib/gana-update.sh

(limited to 'contrib')

diff --git a/contrib/gana b/contrib/gana
index b740d0021..82ff6a36d 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit b740d0021e0ed6c0a7db00eac0e39d33cb263e5d
+Subproject commit 82ff6a36db88799cf6f658bd8855cefa5306c06d
diff --git a/contrib/gana-update.sh b/contrib/gana-update.sh
new file mode 100755
index 000000000..a5da6f1b1
--- /dev/null
+++ b/contrib/gana-update.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Helper script to recompute error codes based on submodule
+# Run from exchange/ main directory.
+set -eu
+
+# Generate taler-error-codes.h in gana and copy it to
+# src/include/taler_error_codes.h
+cd contrib/gana/gnu-taler-error-codes
+make
+cd ../../..
+if ! diff contrib/gana/gnu-taler-error-codes/taler_error_codes.h src/include/taler_error_codes.h > /dev/null
+then
+  echo "Deploying latest new GANA database..."
+  cp contrib/gana/gnu-taler-error-codes/taler_error_codes.h src/include/taler_error_codes.h
+  cp contrib/gana/gnu-taler-error-codes/taler_error_codes.c src/util/taler_error_codes.c
+else
+  echo "GANA database already up-to-date"
+fi
diff --git a/contrib/gana.sh b/contrib/gana.sh
index e6fe32e0a..1055d778b 100755
--- a/contrib/gana.sh
+++ b/contrib/gana.sh
@@ -9,16 +9,4 @@ cd contrib/gana
 git pull origin master
 cd ../..
 
-# Generate taler-error-codes.h in gana and copy it to
-# src/include/taler_error_codes.h
-cd contrib/gana/gnu-taler-error-codes
-make
-cd ../../..
-if ! diff contrib/gana/gnu-taler-error-codes/taler_error_codes.h src/include/taler_error_codes.h > /dev/null
-then
-  echo "Deploying latest new GANA database..."
-  cp contrib/gana/gnu-taler-error-codes/taler_error_codes.h src/include/taler_error_codes.h
-  cp contrib/gana/gnu-taler-error-codes/taler_error_codes.c src/util/taler_error_codes.c
-else
-  echo "GANA database already up-to-date"
-fi
+./contrib/gana-update.sh
-- 
cgit v1.2.3