From 36356ecf350a6885691e2e86c9c98c4cf1545e1c Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Wed, 21 Sep 2016 15:52:26 -0500 Subject: Allow for empty source in dwim_path_relative_stack Fixes #17192 --- lib/ansible/parsing/dataloader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/parsing/dataloader.py b/lib/ansible/parsing/dataloader.py index 1dc9632ddd..2b0c997547 100644 --- a/lib/ansible/parsing/dataloader.py +++ b/lib/ansible/parsing/dataloader.py @@ -291,9 +291,9 @@ class DataLoader(): b_source = to_bytes(source) result = None - if not source: - display.warning('Invalid request to find a file that matches an empty string or "null" value') - elif source.startswith('~') or source.startswith(os.path.sep): + if source is None: + display.warning('Invalid request to find a file that matches a "null" value') + elif source and (source.startswith('~') or source.startswith(os.path.sep)): # path is absolute, no relative needed, check existence and return source test_path = unfrackpath(b_source) if os.path.exists(to_bytes(test_path, errors='surrogate_or_strict')): -- cgit v1.2.1