From 767b44a118a387e45d4344e9469137f4718b839e Mon Sep 17 00:00:00 2001 From: Dirk Pranke Date: Tue, 19 Mar 2019 20:08:42 +0000 Subject: [PATCH] Revert "Remove exception for relative CIPD" This reverts commit 2d29261e94edb6870b8c2575a335545c0f4f670f. Reason for revert: Both jbudorick and I asked you not to land this today :(. Original change's description: > Remove exception for relative CIPD > > This seems to no longer be necessary, as relative paths 'just work' for > CIPD deps now. > > Change-Id: I3843548dc74d29af90e0c402f0459dbe60934423 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1529132 > Reviewed-by: Dirk Pranke > Reviewed-by: John Budorick > Commit-Queue: Brandon Tolsch TBR=dpranke@chromium.org,jbudorick@chromium.org,btolsch@chromium.org Change-Id: I1d9a771ef34dae0dec15499d7cf28e4ba5daf2ff No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1531193 Reviewed-by: Dirk Pranke Commit-Queue: Dirk Pranke --- gclient.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gclient.py b/gclient.py index 867c6ca8f..245c5e68f 100755 --- a/gclient.py +++ b/gclient.py @@ -1878,6 +1878,10 @@ class CipdDependency(Dependency): should_recurse=False, relative=relative, condition=condition) + if relative: + # TODO(jbudorick): Implement relative if necessary. + raise gclient_utils.Error( + 'Relative CIPD dependencies are not currently supported.') self._cipd_package = None self._cipd_root = cipd_root # CIPD wants /-separated paths, even on Windows.