From 02ca84e1465deae3a9c9b1e26f95f21e6d19bd60 Mon Sep 17 00:00:00 2001
From: m431m <m431m@tutanota.com>
Date: Thu, 31 May 2018 14:58:29 +0200
Subject: [PATCH] Fixed lastest commit
---
src/mra.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/mra.py b/src/mra.py
index 86eb3ac..873b83f 100644
--- a/src/mra.py
+++ b/src/mra.py
@@ -628,8 +628,14 @@ class Workspace(Mapfile):
def get_store_info(self, st_type, name, exclude=None):
info = self.get_mra_metadata("%ss" % st_type, {})[name].copy()
info["name"] = name
- for k in exclude:
- info.pop(k)
+
+ for v in exclude:
+ path = tuple(k for k in v.split('.'))
+ copy = info
+ for m in path[:-1]:
+ copy = copy.get(m)
+ del copy[path[-1]]
+
return info
def iter_store_names(self, st_type):
@@ -662,7 +668,8 @@ class Workspace(Mapfile):
def get_datastore_info(self, name):
"""Returns info for a datastore from the workspace."""
- return self.get_store_info("datastore", name, exclude=["password"])
+ return self.get_store_info(
+ "datastore", name, exclude=["connectionParameters.password"])
def iter_datastore_names(self):
"""Return an iterator over the datastore names."""
--
GitLab