From 95fe4fea19f30281a3ff53f62c9fcda533c4e04a Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@google.com>
Date: Mon, 13 Sep 2021 15:31:52 -0700
Subject: tools/show_paths.bzl: check that provider_map isn't None

Otherwise it can fail:
$ bazel cquery pkg/p9/... --output=starlark --starlark:file=tools/show_paths.bzl
...
ERROR: Starlark evaluation error for //pkg/p9/p9test:mockgen:
Traceback (most recent call last):
	File "tools/show_paths.bzl", line 8, column 32, in format
Error: 'NoneType' value has no field or method 'get'
PiperOrigin-RevId: 396457764
---
 tools/bazel.mk       | 4 ++--
 tools/show_paths.bzl | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/bazel.mk b/tools/bazel.mk
index 4f979bbeb..1444423e4 100644
--- a/tools/bazel.mk
+++ b/tools/bazel.mk
@@ -186,8 +186,8 @@ build_paths = \
   (set -euo pipefail; \
   $(call wrapper,$(BAZEL) build $(BASE_OPTIONS) $(BAZEL_OPTIONS) $(1)) && \
   $(call wrapper,$(BAZEL) cquery $(BASE_OPTIONS) $(BAZEL_OPTIONS) $(1) --output=starlark --starlark:file=tools/show_paths.bzl) \
-  | xargs -r -n 1 -I {} readlink -f "{}" \
-  | xargs -r -n 1 -I {} bash -c 'set -xeuo pipefail; $(2)')
+  | xargs -r -n 1 -I {} bash -c 'test -e "{}" || exit 0; readlink -f "{}"' \
+  | xargs -r -n 1 -I {} bash -c 'set -euo pipefail; $(2)')
 
 clean = $(call header,CLEAN) && $(call wrapper,$(BAZEL) clean)
 build = $(call header,BUILD $(1)) && $(call build_paths,$(1),echo {})
diff --git a/tools/show_paths.bzl b/tools/show_paths.bzl
index ba78d3494..f0126ac7b 100644
--- a/tools/show_paths.bzl
+++ b/tools/show_paths.bzl
@@ -2,6 +2,8 @@
 
 def format(target):
     provider_map = providers(target)
+    if not provider_map:
+        return ""
     outputs = dict()
 
     # Try to resolve in order.
-- 
cgit v1.2.3