Skip to content

Commit 542f376

Browse files
Merge pull request #459 from Luci2015/v2
Fix for #458
2 parents 9588420 + 639e6c5 commit 542f376

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

user_sync/app.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ def begin_work(config_loader):
318318
additional_groups = rule_config.get('additional_groups', None)
319319
if additional_groups and isinstance(additional_groups, list):
320320
additional_group_filters = [r['source'] for r in additional_groups]
321-
322-
directory_connector.state.additional_group_filters = additional_group_filters
321+
if directory_connector is not None:
322+
directory_connector.state.additional_group_filters = additional_group_filters
323323

324324
primary_name = '.primary' if secondary_umapi_configs else ''
325325
umapi_primary_connector = user_sync.connector.umapi.UmapiConnector(primary_name, primary_umapi_config)

user_sync/config.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,11 @@ def load_invocation_options(self):
153153
raise AssertionException('You cannot specify --adobe-only-user-action when using "push" strategy')
154154
self.logger.info("Strategy push: ignoring default adobe-only-user-action")
155155
else:
156-
adobe_action_spec = self.args['adobe_only_user_action'] or options['adobe_only_user_action']
156+
if self.args['adobe_only_user_action']:
157+
adobe_action_spec = self.args['adobe_only_user_action']
158+
options['adobe_only_user_action'] = self.args['adobe_only_user_action']
159+
else:
160+
adobe_action_spec = options['adobe_only_user_action']
157161
adobe_action = user_sync.helper.normalize_string(adobe_action_spec[0])
158162
if adobe_action == 'preserve':
159163
pass # no option settings needed

0 commit comments

Comments
 (0)