aboutsummaryrefslogtreecommitdiffstats
path: root/python/tidy/servo_tidy/tidy.py
diff options
context:
space:
mode:
authorMaxim Novikov <mnovikov.work@gmail.com>2017-11-21 19:21:07 +0100
committerMaxim Novikov <mnovikov.work@gmail.com>2017-11-21 21:08:14 +0100
commite6d9fd8a4ff9351d5e06c092a9ddc43de5cb73b8 (patch)
treef6c466f678354c831b04555ca7b24a9e4cb38d84 /python/tidy/servo_tidy/tidy.py
parent83c7f80baacaa41fe12d1e43ceecce700e490da9 (diff)
downloadservo-e6d9fd8a4ff9351d5e06c092a9ddc43de5cb73b8.tar.gz
servo-e6d9fd8a4ff9351d5e06c092a9ddc43de5cb73b8.zip
Report an errror if a package has duplicates allowed but there are no duplicates
Resolves: #19306
Diffstat (limited to 'python/tidy/servo_tidy/tidy.py')
-rw-r--r--python/tidy/servo_tidy/tidy.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py
index fbc4952e1ee..2f638abe099 100644
--- a/python/tidy/servo_tidy/tidy.py
+++ b/python/tidy/servo_tidy/tidy.py
@@ -339,10 +339,17 @@ def check_lock(file_name, contents):
packages_by_name.setdefault(package["name"], []).append((package["version"], source))
for (name, packages) in packages_by_name.iteritems():
- if name in exceptions or len(packages) <= 1:
+ has_duplicates = len(packages) > 1
+ duplicates_allowed = name in exceptions
+
+ if has_duplicates == duplicates_allowed:
continue
- message = "duplicate versions for package `{}`".format(name)
+ if duplicates_allowed:
+ message = 'duplicates for `{}` are allowed, but only single version found'.format(name)
+ else:
+ message = "duplicate versions for package `{}`".format(name)
+
packages.sort()
packages_dependencies = list(find_reverse_dependencies(name, content))
for version, source in packages: