From 17939f430c6747bc080338927bec35a3b34a83f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Wed, 28 Jul 2021 15:26:30 +0200 Subject: [PATCH] Print names of added/removed packages in case a manual DEPS update is needed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I8ed37d8c2162c6077a7851ac352df0e8a1bb7eba Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227038 Commit-Queue: Björn Terelius Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#34588} --- tools_webrtc/autoroller/roll_deps.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools_webrtc/autoroller/roll_deps.py b/tools_webrtc/autoroller/roll_deps.py index 0385dd7aa0..925e76f047 100755 --- a/tools_webrtc/autoroller/roll_deps.py +++ b/tools_webrtc/autoroller/roll_deps.py @@ -283,11 +283,18 @@ 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}) + old_pkgs_names = {p['package'] for p in old_pkgs} + new_pkgs_names = {p['package'] for p in new_pkgs} + pkgs_equal = (old_pkgs_names == new_pkgs_names) + added_pkgs = [p for p in new_pkgs_names if p not in old_pkgs_names] + removed_pkgs = [p for p in old_pkgs_names if p not in new_pkgs_names] + 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)) + 'list match.\nMost likely, you should add \"%s\" and ' + 'remove \"%s\"' % + (old_pkgs, new_pkgs, added_pkgs, removed_pkgs)) + for old_pkg in old_pkgs: for new_pkg in new_pkgs: old_version = old_pkg['version']