Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keepercommander/commands/enterprise.py
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,7 @@ def execute(self, params, **kwargs):
logging.warning('Node \'%s\' already exists: Skipping.', node['data'].get('displayname'))

if not unmatched_nodes:
raise CommandError('enterprise-node', 'No nodes to add.')
return

if parent_id is None:
for node in params.enterprise['nodes']:
Expand Down
6 changes: 6 additions & 0 deletions keepercommander/commands/msp.py
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,12 @@ def execute(self, params, **kwargs):
seats = 2147483647

name = kwargs['name']
managed_companies = params.enterprise.get('managed_companies', [])
existing_mc = get_mc_by_name_or_id(managed_companies, name)
if existing_mc:
logging.warning('Managed company \'%s\' already exists: Skipping', name)
return

tree_key = utils.generate_aes_key()
rq = {
'command': 'enterprise_registration_by_msp',
Expand Down
Loading