commit 4ce578a81d37e1758ce82d3e7aacdc535c855059
author Rob Mohr <mohrr@google.com> Thu Jul 16 15:08:24 2020 -0700
committer CQ Bot Account <commit-bot@chromium.org> Fri Jul 17 15:58:56 2020 +0000
tree ec86937cadddbe83ab35bde78d19fb9d1e726bfd
parent 712d367245b7396e9c15a5ff75ed32d341c16c77

pw_doctor: Update CIPD path

Change-Id: I4d27da1fb1e7d781ed98655e31f0fa61e1148836
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/14042
Reviewed-by: Keir Mierle <keir@google.com>
Commit-Queue: Rob Mohr <mohrr@google.com>

pw_doctor/py/pw_doctor/doctor.py

diff --git a/pw_doctor/py/pw_doctor/doctor.py b/pw_doctor/py/pw_doctor/doctor.py
index c1a994f..74a4c87 100755
--- a/pw_doctor/py/pw_doctor/doctor.py
+++ b/pw_doctor/py/pw_doctor/doctor.py
@@ -253,7 +253,11 @@
     except KeyError:
         return  # This case is handled elsewhere.
 
-    versions_path = root.joinpath('.cipd', 'pigweed', '.versions')
+    if 'PW_PIGWEED_CIPD_INSTALL_DIR' not in os.environ:
+        ctx.error('PW_PIGWEED_CIPD_INSTALL_DIR not set')
+    cipd_dir = pathlib.Path(os.environ['PW_PIGWEED_CIPD_INSTALL_DIR'])
+
+    versions_path = cipd_dir / '.versions'
     # Deliberately not checking luci.json--it's not required to be up-to-date.
     json_path = root.joinpath('pw_env_setup', 'py', 'pw_env_setup',
                               'cipd_setup', 'pigweed.json')