From 9ac9d4203079336bc3176a2090246ada4f74ffce Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Wed, 25 Jan 2017 13:46:45 -0500 Subject: [PATCH] allow empty whitelist --- lib/ansible/utils/display.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ansible/utils/display.py b/lib/ansible/utils/display.py index 645685664b..c98b1eb17f 100644 --- a/lib/ansible/utils/display.py +++ b/lib/ansible/utils/display.py @@ -84,7 +84,9 @@ class Display: try: cmd = subprocess.Popen([self.b_cowsay, "-l"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) (out, err) = cmd.communicate() - self.cows_available = [ to_bytes(c) for c in set(C.ANSIBLE_COW_WHITELIST).intersection(out.split())] + self.cows_available = set([ to_bytes(c) for c in out.split() ]) + if C.ANSIBLE_COW_WHITELIST: + self.cows_available = set(C.ANSIBLE_COW_WHITELIST).intersection(self.cows_available) except: # could not execute cowsay for some reason self.b_cowsay = False