[taler-deployment] branch master updated: use exec-compile

[gnunet]

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

grothoff pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new 0bdb353  use exec-compile
     new ec0fd5d  merge
0bdb353 is described below

commit 0bdb35317ad118a6e57ef6c412f58d0c3b6c7f16
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Jun 3 11:13:12 2020 +0200

    use exec-compile
---
 bin/taler-config-generate | 5 +++--
 buildbot/master.cfg       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/taler-config-generate b/bin/taler-config-generate
index d83dc14..54a4012 100755
--- a/bin/taler-config-generate
+++ b/bin/taler-config-generate
@@ -132,11 +132,12 @@ def config(obj):
     obj.cfg_put("merchantdb-postgres", "config", 
"postgres:///taler{}".format(obj.envname))
 
     if "demo" != obj.envname and obj.twisted:
-        obj.cfg_put("merchant-exchange-test", "url", 
"https://twister-exchange.wild.gv.taler.net/";)
+        obj.cfg_put("merchant-exchange-test", "exchange_base_url", 
"https://twister-exchange.wild.gv.taler.net/";)
     else:
-        obj.cfg_put("merchant-exchange-test", "url", 
"https://exchange.{}.taler.net/".format(obj.envname))
+        obj.cfg_put("merchant-exchange-test", "exchange_base_url", 
"https://exchange.{}.taler.net/".format(obj.envname))
 
     obj.cfg_put("merchant-exchange-test", "master_key", obj.exchange_pub)
+    obj.cfg_put("merchant-exchange-test", "currency", obj.currency)
 
     obj.cfg_put("frontends", "backend_apikey", "sandbox".format(obj.envname))
 
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index aff8f8a..f8e1c22 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -953,7 +953,7 @@ c["titleURL"] = "https://taler.net";
 # We use nginx to expose the BB under this URL.
 c["buildbotURL"] = "https://buildbot.taler.net/";
 
-from taler_bb_userpass_db import USER_PASSWORD_DB
+exec(compile(open('../taler_bb_userpass_db/taler_bb_userpass_db/db.py').read()))
 
 BUILDER_LIST = [
     "buildmaster-builder",

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