diff --git a/gclient.py b/gclient.py index 954523a850..659fdb4820 100755 --- a/gclient.py +++ b/gclient.py @@ -94,6 +94,8 @@ import sys import time import urllib.parse +from collections.abc import Collection, Mapping, Sequence + import detect_host_arch import fix_encoding import git_common @@ -2377,7 +2379,8 @@ it or fix the checkout. # Service URLs should be constant over the scope of a cipd # root, so a var per DEPS file specifying the service URL # should suffice. - 'https://chrome-infra-packages.appspot.com') + 'https://chrome-infra-packages.appspot.com', + log_level='info' if self._options.verbose else None) return self._cipd_root @property diff --git a/gclient_scm.py b/gclient_scm.py index e1e631a978..781293d002 100644 --- a/gclient_scm.py +++ b/gclient_scm.py @@ -1673,13 +1673,14 @@ class CipdPackage(object): class CipdRoot(object): """A representation of a single CIPD root.""" - def __init__(self, root_dir, service_url): + def __init__(self, root_dir, service_url, log_level=None): self._all_packages = set() self._mutator_lock = threading.Lock() self._packages_by_subdir = collections.defaultdict(list) self._root_dir = root_dir self._service_url = service_url self._resolved_packages = None + self._log_level = log_level or 'error' def add_package(self, subdir, package, version): """Adds a package to this CIPD root. @@ -1771,7 +1772,7 @@ class CipdRoot(object): 'cipd', 'ensure', '-log-level', - 'info', + self._log_level, '-root', self.root_dir, '-ensure-file', @@ -1814,7 +1815,7 @@ class CipdRoot(object): 'cipd', 'ensure-file-resolve', '-log-level', - 'info', + self._log_level, '-ensure-file', ensure_file, '-json-output',