Port changes from workshop

diff --git a/bin/workshop_check.py b/bin/workshop_check.py
index db9606a6047ff81ef5b09e221ace982844972b7b..f82ce3d69417e3cd1990aea96603afcda2e2aff9 100755 (executable)
--- a/bin/workshop_check.py
+++ b/bin/workshop_check.py
@@ -210,8 +210,15 @@ def check_email(email):
     an '@', and more characters.  It should not contain the default contact
     """
 
-    return bool(re.match(EMAIL_PATTERN, email)) and \
-           (email != DEFAULT_CONTACT_EMAIL)
+    # YAML automatically loads list-like strings as lists.
+    if (isinstance(emails, list) and len(emails) >= 0):
+        for email in emails:
+            if ((not bool(re.match(EMAIL_PATTERN, email))) or (email == DEFAULT_CONTACT_EMAIL)):
+                return False
+    else:
+        return False
+  
+    return True
 
 
 def check_eventbrite(eventbrite):