File tree Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -318,8 +318,8 @@ def begin_work(config_loader):
318
318
additional_groups = rule_config .get ('additional_groups' , None )
319
319
if additional_groups and isinstance (additional_groups , list ):
320
320
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
323
323
324
324
primary_name = '.primary' if secondary_umapi_configs else ''
325
325
umapi_primary_connector = user_sync .connector .umapi .UmapiConnector (primary_name , primary_umapi_config )
Original file line number Diff line number Diff line change @@ -153,7 +153,11 @@ def load_invocation_options(self):
153
153
raise AssertionException ('You cannot specify --adobe-only-user-action when using "push" strategy' )
154
154
self .logger .info ("Strategy push: ignoring default adobe-only-user-action" )
155
155
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' ]
157
161
adobe_action = user_sync .helper .normalize_string (adobe_action_spec [0 ])
158
162
if adobe_action == 'preserve' :
159
163
pass # no option settings needed
You can’t perform that action at this time.
0 commit comments