Improved type checking error message; no longer checking the default value type if the property type check failed

Author: relgit

pre_commit_hooks/check_preference_manifests.py

@@ -184,7 +184,7 @@ def validate_pfm_type_strings(subkey, filename):
         print(f'{filename}: WARNING: Subkey type "{subkey["pfm_type"]}" is deprecated')
         # passed = False
     elif subkey["pfm_type"] not in PLIST_TYPES:
-        print(f'{filename}: Unexpected subkey type "{subkey["pfm_type"]}"')
+        print(f'{filename}: Unexpected subkey type {subkey["pfm_type"]} for {subkey.get("pfm_name")}')
         passed = False
 
     return passed
@@ -333,6 +333,7 @@ def validate_platforms(subkey, filename):
 def validate_subkeys(subkeys, filename):
     """Given a list of subkeys, run validation on their contents."""
     passed = True
+    type_passed = True
 
     for subkey in subkeys:
 
@@ -355,6 +356,7 @@ def validate_subkeys(subkeys, filename):
         # Check for rogue pfm_type strings and deprecated keys.
         if not validate_pfm_type_strings(subkey, filename):
             passed = False
+            type_passed = False
 
         # TODO: Suggest adding a title if one is missing
         # if "pfm_title" not in subkey:
@@ -378,7 +380,10 @@ def validate_subkeys(subkeys, filename):
             passed = False
 
         # Check default values to ensure consistent type
-        if not validate_pfm_default(subkey, filename):
+        if (
+            type_passed
+            and not validate_pfm_default(subkey, filename)
+        ):
             passed = False
 
         # Validate URLs