diff options
| author | Marcello Stanisci <stanisci.m@gmail.com> | 2017-11-04 21:20:05 +0100 |
|---|---|---|
| committer | Marcello Stanisci <stanisci.m@gmail.com> | 2017-11-04 21:20:05 +0100 |
| commit | e22f7049d78f0f58c513f3be2d42d40bb06fab25 (patch) | |
| tree | 453f2f2140ee7f29223a6382f089066c57ce391d | |
| parent | 44f92cd7a03c5a2213b7b44a3738ae1e3871f792 (diff) | |
| download | bank-e22f7049d78f0f58c513f3be2d42d40bb06fab25.tar.gz bank-e22f7049d78f0f58c513f3be2d42d40bb06fab25.tar.bz2 bank-e22f7049d78f0f58c513f3be2d42d40bb06fab25.zip | |
#5012
| m--------- | talerbank/app/static/web-common | 0 | ||||
| -rw-r--r-- | talerbank/talerconfig.py | 4 |
2 files changed, 4 insertions, 0 deletions
diff --git a/talerbank/app/static/web-common b/talerbank/app/static/web-common -Subproject d7e013594d15388b1a7342a44a0e9c8d4ecca82 +Subproject 489a9e38e6960fdce309ab8cf5ff66d930ecb3b 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: |