From dc65cffdc050993aab1ffb6373e1498810a92e81 Mon Sep 17 00:00:00 2001 From: Gowroji Sunil <48122892+sgowroji@users.noreply.github.com> Date: Fri, 15 Jul 2022 10:43:13 +0530 Subject: [PATCH] Fix behavior of `print()` in module extensions (#15883) Previously, messages printed with `print()` didn't have the usual `DEBUG:` prefix. Fixes #14526 Closes #15795. PiperOrigin-RevId: 459052873 Change-Id: I1b75498d448aaae137dd63ea0a418572097bdac2 Co-authored-by: Fabian Meumertzheim Co-authored-by: Chenchu K --- .../build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java index 889f85ef5f40ab..cd85ff18046bbb 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java @@ -86,6 +86,7 @@ public void setRepositoryRemoteExecutor(RepositoryRemoteExecutor repositoryRemot this.repositoryRemoteExecutor = repositoryRemoteExecutor; } + @Nullable @Override public SkyValue compute(SkyKey skyKey, Environment env) throws SkyFunctionException, InterruptedException { @@ -161,6 +162,7 @@ public SkyValue compute(SkyKey skyKey, Environment env) try (Mutability mu = Mutability.create("module extension", usagesValue.getExtensionUniqueName())) { StarlarkThread thread = new StarlarkThread(mu, starlarkSemantics); + thread.setPrintHandler(Event.makeDebugPrintHandler(env.getListener())); ModuleExtensionContext moduleContext = createContext(env, usagesValue, starlarkSemantics, extension); threadContext.storeInThread(thread);