servo: Merge #14737 - Package: Various improvements (from UK992:package-prefs); r=Wafflespeanut

Fixes https://github.com/servo/servo/issues/11966
Fixes https://github.com/servo/servo/issues/12707

Also adds simple mechanism to set os specific prefs, by adding  like `os:macosx,os:windows;` before pref name.

Source-Repo: https://github.com/servo/servo
Source-Revision: b5f3d7dd413886037de8f1bc435ede34a98421b3
This commit is contained in:
UK992
2016-12-29 10:28:37 -08:00
parent 9c0028f1f5
commit fa8ef55c08
9 changed files with 73 additions and 128 deletions

View File

@@ -734,7 +734,7 @@ def check_for_alphabetical_sorted_json_keys(key_value_pairs):
def check_json_requirements(filename):
def check_fn(key_value_pairs):
check_for_possible_duplicate_json_keys(key_value_pairs)
if filename in config["check-ordered-json-keys"]:
if filename in normilize_paths(config["check-ordered-json-keys"]):
check_for_alphabetical_sorted_json_keys(key_value_pairs)
return check_fn