Skip to content

Commit 6750238

Browse files
Merge pull request #378 from bhunut-adobe/bugfix/user-filter-invocation
Bug fix: --user-filter and config invocation default precedence
2 parents b956559 + a80a21e commit 6750238

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

user_sync/config.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,9 @@ def load_invocation_options(self):
238238
raise AssertionException('You cannot specify --user-filter when using an adobe-only-user-list')
239239
self.logger.info("adobe-only-user-list specified, so ignoring default user filter specification")
240240
else:
241-
username_filter_pattern = self.args['user_filter'] or options['user_filter']
241+
if self.args['user_filter'] is not None:
242+
options['user_filter'] = self.args['user_filter']
243+
username_filter_pattern = options['user_filter']
242244
if username_filter_pattern:
243245
try:
244246
compiled_expression = re.compile(r'\A' + username_filter_pattern + r'\Z', re.IGNORECASE)

0 commit comments

Comments
 (0)