From 4de6cfa5a9368a4a10937e6527e55bc993113858 Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Wed, 12 Aug 2020 08:37:36 +0000 Subject: [PATCH] Remove use_relative_hooks now that all deprecated uses are removed. Bug: chromium:1107325 Change-Id: Iac1ff8ef9426c8f57b6e12783de0ffbb0625ef2b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2349170 Reviewed-by: Josip Sokcevic Commit-Queue: Corentin Wallez --- gclient.py | 4 ---- gclient_eval.py | 4 ---- 2 files changed, 8 deletions(-) diff --git a/gclient.py b/gclient.py index ba75b78204..325517bbb5 100755 --- a/gclient.py +++ b/gclient.py @@ -793,10 +793,6 @@ class Dependency(gclient_utils.WorkItem, DependencySettings): self._postprocess_deps(deps, rel_prefix), self._use_relative_paths) # compute which working directory should be used for hooks - if local_scope.get('use_relative_hooks', False): - print('use_relative_hooks is deprecated, please remove it from DEPS. ' + - '(it was merged in use_relative_paths)', file=sys.stderr) - hooks_cwd = self.root.root_dir if self._use_relative_paths: hooks_cwd = os.path.join(hooks_cwd, self.name) diff --git a/gclient_eval.py b/gclient_eval.py index c0098e4d43..8cf91f012d 100644 --- a/gclient_eval.py +++ b/gclient_eval.py @@ -235,10 +235,6 @@ _GCLIENT_SCHEMA = schema.Schema( # file. schema.Optional('use_relative_paths'): bool, - # For recursed-upon sub-dependencies, run their hooks relative to the - # parent's path instead of relative to the .gclient file. - schema.Optional('use_relative_hooks'): bool, - # Variables that can be referenced using Var() - see 'deps'. schema.Optional('vars'): _NodeDictSchema({ schema.Optional(basestring): schema.Or(ConstantString,