[tracker/sam/tracker-2.3-developer-experience: 41/45] utils/trackertestutils: Fix broken PATH and LD_LIBRARY_PATH
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/sam/tracker-2.3-developer-experience: 41/45] utils/trackertestutils: Fix broken PATH and LD_LIBRARY_PATH
- Date: Wed, 2 Oct 2019 11:57:03 +0000 (UTC)
commit 2b5ca7110ea2e7a133ed8f587b50263a92b17aee
Author: Sam Thursfield <sam afuera me uk>
Date: Sat Sep 28 14:40:54 2019 +0200
utils/trackertestutils: Fix broken PATH and LD_LIBRARY_PATH
This fixes a regression from b68cef0297254aac79c which caused us to
remove the existing PATH when --prefix was used.
utils/trackertestutils/__main__.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/utils/trackertestutils/__main__.py b/utils/trackertestutils/__main__.py
index 0b7b3daba..9828e102f 100644
--- a/utils/trackertestutils/__main__.py
+++ b/utils/trackertestutils/__main__.py
@@ -106,8 +106,8 @@ def environment_unset(dbus):
def environment_set_and_add_path(env, var, prefix, suffix):
new = os.path.join(prefix, suffix)
- if var in env:
- existing = env[var]
+ if var in os.environ:
+ existing = os.environ[var]
full = '%s:%s' % (new, existing)
else:
full = new
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]