Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-08 08:33:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use skia and deps from crates.io.

Browse source 
Fix https://github.com/servo/skia/issues/70
This commit is contained in:
Simon Sapin 2015-11-30 21:39:27 +01:00
parent 3720e4d5ef
commit aa1eba4f5a
26 changed files with 811 additions and 752 deletions
Download patch file Download diff file Expand all files Collapse all files

13
python/tidy.py
View file

@ -181,12 +181,12 @@ def check_lock(file_name, contents):
packages[name] = (version, idx + 1, base_name)
elif all([packages[name][0] != version, name not in exceptions, base_name not in exceptions]):
line = idx + 1
version_1 = tuple(map(int, packages[name][0].split('.')))
version_2 = tuple(map(int, version.split('.')))
version_1 = tuple(map(maybe_int, packages[name][0].split('.')))
version_2 = tuple(map(maybe_int, version.split('.')))
if version_1 < version_2: # get the line & base package containing the older version
packages[name], (version, line, base_name) = (version, line, base_name), packages[name]
message = 'conflicting versions for package "%s"' % name
message = 'duplicate versions for package "%s"' % name
error = '\n\t\033[93mexpected maximum version "{}"\033[0m'.format(packages[name][0]) + \
'\n\t\033[91mbut, "{}" demands "{}"\033[0m' \
.format(base_name, version)
@ -198,6 +198,13 @@ def check_lock(file_name, contents):
idx += 1
def maybe_int(value):
try:
return int(value)
except ValueError:
return value
def check_toml(file_name, contents):
if not file_name.endswith(".toml"):
raise StopIteration