diff options
| author | Kali Kaneko <kali@leap.se> | 2015-10-29 12:00:39 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-10-29 12:00:39 -0400 |
| commit | ee0e9cadccd00cb62032d8fc4b322bb6fe3dc7ed (patch) | |
| tree | aae58b3f251c5a621d75b8d77428bbd90699e560 /src/leap/common/events/client.py | |
| parent | 3ab6b2aff4a38a4fabd4320880ef795f05ccd17f (diff) | |
| parent | 3fabc788c27b2c2619d8e23b3eebc018b95faf7a (diff) | |
Merge tag '0.4.4' into debian/experimental
Tag leap.common version 0.4.4
Diffstat (limited to 'src/leap/common/events/client.py')
| -rw-r--r-- | src/leap/common/events/client.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/leap/common/events/client.py b/src/leap/common/events/client.py index e38e9d3..60d24bc 100644 --- a/src/leap/common/events/client.py +++ b/src/leap/common/events/client.py @@ -47,7 +47,7 @@ try: except ImportError: pass -from leap.common.config import get_path_prefix +from leap.common.config import flags, get_path_prefix from leap.common.zmq_utils import zmq_has_curve from leap.common.zmq_utils import maybe_create_and_get_certificates from leap.common.zmq_utils import PUBLIC_KEYS_PREFIX @@ -55,7 +55,6 @@ from leap.common.zmq_utils import PUBLIC_KEYS_PREFIX from leap.common.events.errors import CallbackAlreadyRegisteredError from leap.common.events.server import EMIT_ADDR from leap.common.events.server import REG_ADDR -from leap.common.events import flags from leap.common.events import catalog @@ -280,7 +279,7 @@ class EventsClientThread(threading.Thread, EventsClient): self._lock = threading.Lock() self._initialized = threading.Event() self._config_prefix = os.path.join( - get_path_prefix(), "leap", "events") + get_path_prefix(flags.STANDALONE), "leap", "events") self._loop = None self._context = None self._push = None |