[GNUnet-SVN] [taler-bank] branch master updated: #5012

[gnunet]

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

marcello pushed a commit to branch master
in repository bank.

The following commit(s) were added to refs/heads/master by this push:
     new e22f704   #5012
e22f704 is described below

commit e22f7049d78f0f58c513f3be2d42d40bb06fab25
Author: Marcello Stanisci <address@hidden>
AuthorDate: Sat Nov 4 21:20:05 2017 +0100

     #5012
---
 talerbank/app/static/web-common | 2 +-
 talerbank/talerconfig.py        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/talerbank/app/static/web-common b/talerbank/app/static/web-common
index d7e0135..489a9e3 160000
--- a/talerbank/app/static/web-common
+++ b/talerbank/app/static/web-common
@@ -1 +1 @@
-Subproject commit d7e013594d15388b1a7342a44a0e9c8d4ecca82d
+Subproject commit 489a9e38e6960fdce309ab8cf5ff66d930ecb3bc
diff --git a/talerbank/talerconfig.py b/talerbank/talerconfig.py
index f9157f0..d72e15f 100644
--- a/talerbank/talerconfig.py
+++ b/talerbank/talerconfig.py
@@ -26,6 +26,7 @@ import collections
 import os
 import weakref
 import sys
+import re
 
 logger = logging.getLogger(__name__)
 
@@ -223,6 +224,9 @@ class TalerConfig:
             return
         prefix = os.environ.get("TALER_PREFIX")
         if prefix:
+            tmp = os.path.split(os.path.normpath(prefix))
+            if re.match("lib", tmp[1]):
+                prefix = tmp[0]
             self.load_dir(os.path.join(prefix, "share/taler/config.d"))
             return
         if taler_datadir:

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