diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py index 72ac620cea8a7d0c6bca68610b92bf485050ed95..abc4f6fb073aca0993a8eb3cb39a0f03ab4c0b3d 100644 --- a/src/caosdb/common/models.py +++ b/src/caosdb/common/models.py @@ -2530,7 +2530,7 @@ class Container(list): sync_remote_entities = [] for remote_entity in remote_container: - if (remote_entity.name is not None \ + if (remote_entity.name is not None and (str(remote_entity.name) == str(local_entity.name) or (name_case_sensitive is False and diff --git a/src/caosdb/connection/authentication/input.py b/src/caosdb/connection/authentication/input.py index e0b4c7603145e2b7435a874bb04869c560710ec7..7edec7c814d9019d43701b33d4022063081714a7 100644 --- a/src/caosdb/connection/authentication/input.py +++ b/src/caosdb/connection/authentication/input.py @@ -81,7 +81,10 @@ class InputCredentialsProvider(CredentialsProvider): else: self._username = input("Please enter the user name: ") - self._password = getpass.getpass("Please enter the password: ") + url = config["url"] + self._password = getpass.getpass( + "Please enter the password for `{}` at `{}`: ".format( + self._username, url)) @property def password(self):