Merge pull request #459 from Luci2015/v2

Fix for  #458

Author: adorton-adobe

user_sync/app.py

@@ -318,8 +318,8 @@ def begin_work(config_loader):
     additional_groups = rule_config.get('additional_groups', None)
     if additional_groups and isinstance(additional_groups, list):
         additional_group_filters = [r['source'] for r in additional_groups]
-
-    directory_connector.state.additional_group_filters = additional_group_filters
+    if directory_connector is not None:
+        directory_connector.state.additional_group_filters = additional_group_filters
 
     primary_name = '.primary' if secondary_umapi_configs else ''
     umapi_primary_connector = user_sync.connector.umapi.UmapiConnector(primary_name, primary_umapi_config)

user_sync/config.py

@@ -153,7 +153,11 @@ def load_invocation_options(self):
                 raise AssertionException('You cannot specify --adobe-only-user-action when using "push" strategy')
             self.logger.info("Strategy push: ignoring default adobe-only-user-action")
         else:
-            adobe_action_spec = self.args['adobe_only_user_action'] or options['adobe_only_user_action']
+            if self.args['adobe_only_user_action']:
+                adobe_action_spec = self.args['adobe_only_user_action']
+                options['adobe_only_user_action'] = self.args['adobe_only_user_action']
+            else:
+                adobe_action_spec = options['adobe_only_user_action']
             adobe_action = user_sync.helper.normalize_string(adobe_action_spec[0])
             if adobe_action == 'preserve':
                 pass  # no option settings needed