From 9d3626d15de7281952f7d4b41a596baf8ac2668e Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Wed, 19 Feb 2020 09:38:59 +0100 Subject: [PATCH] Make error message more actionable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the assertion triggers, manual action is likely needed. This CL changes the error message to make it more clear. No-Try: True Bug: webrtc:11369 Change-Id: I7d8b04deef7638e715b12e6dceeee9cc2ce2cc66 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/168761 Commit-Queue: Mirko Bonadei Reviewed-by: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#30553} --- tools_webrtc/autoroller/roll_deps.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py index 2e9a1c2cfe..77dd7d8d73 100755 --- a/tools_webrtc/autoroller/roll_deps.py +++ b/tools_webrtc/autoroller/roll_deps.py @@ -261,7 +261,9 @@ def BuildDepsentryDict(deps_dict): def _FindChangedCipdPackages(path, old_pkgs, new_pkgs): pkgs_equal = ({p['package'] for p in old_pkgs} == {p['package'] for p in new_pkgs}) - assert pkgs_equal, 'Old: %s\n New: %s' % (old_pkgs, new_pkgs) + assert pkgs_equal, ('Old: %s\n New: %s.\nYou need to do a manual roll ' + 'and remove/add entries in DEPS so the old and new ' + 'list match.' % (old_pkgs, new_pkgs)) for old_pkg in old_pkgs: for new_pkg in new_pkgs: old_version = old_pkg['version']