From 0e99b9be0afe1cf0aa824cf7fd919bbef66ba5d8 Mon Sep 17 00:00:00 2001 From: Michael Spang Date: Wed, 12 Aug 2020 13:34:48 +0000 Subject: [PATCH] Revert "Remove use_relative_hooks now that all deprecated uses are removed." This reverts commit 4de6cfa5a9368a4a10937e6527e55bc993113858. Reason for revert: Breaks syncing old versions. Original change's description: > 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 TBR=cwallez@chromium.org,ehmaldonado@chromium.org,infra-scoped@luci-project-accounts.iam.gserviceaccount.com,sokcevic@google.com Change-Id: I91229c64486fe328341d1951a0b8d4dc33ee8810 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:1107325 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2352090 Auto-Submit: Michael Spang Commit-Queue: Josip Sokcevic Reviewed-by: Josip Sokcevic --- gclient.py | 4 ++++ gclient_eval.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/gclient.py b/gclient.py index 325517bbb..ba75b7820 100755 --- a/gclient.py +++ b/gclient.py @@ -793,6 +793,10 @@ 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 8cf91f012..c0098e4d4 100644 --- a/gclient_eval.py +++ b/gclient_eval.py @@ -235,6 +235,10 @@ _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,