diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/Args.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/Args.java index 72f2f2c017c3a8..a063d8381a6ab9 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/Args.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/Args.java @@ -528,7 +528,8 @@ public CommandLineArgsApi useParamsFile(String paramFileArg, Boolean useAlways) Starlark.checkMutable(this); if (!SingleStringArgFormatter.isValid(paramFileArg)) { throw Starlark.errorf( - "Invalid value for parameter \"param_file_arg\": Expected string with a single \"%s\"", + "Invalid value for parameter \"param_file_arg\": Expected string with a single \"%%s\"," + + " got \"%s\"", paramFileArg); } this.flagFormatString = paramFileArg; diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java index 33af53540b684e..fa4f93d902f972 100644 --- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java +++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkRuleImplementationFunctionsTest.java @@ -2387,11 +2387,12 @@ public void testWriteArgsToParamFile() throws Exception { public void testLazyArgsWithParamFileInvalidFormatString() throws Exception { setRuleContext(createRuleContext("//foo:foo")); ev.checkEvalErrorContains( - "Invalid value for parameter \"param_file_arg\": Expected string with a single \"--file=\"", + "Invalid value for parameter \"param_file_arg\": " + + "Expected string with a single \"%s\", got \"--file=\"", "args = ruleContext.actions.args()\n" + "args.use_param_file('--file=')"); ev.checkEvalErrorContains( "Invalid value for parameter \"param_file_arg\": " - + "Expected string with a single \"--file=%s%s\"", + + "Expected string with a single \"%s\", got \"--file=%s%s\"", "args = ruleContext.actions.args()\n" + "args.use_param_file('--file=%s%s')"); }