Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always try to parse starlark options #17875

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -262,20 +262,17 @@ private void parseArgsAndConfigs(List<String> args, ExtendedEventHandler eventHa
* not passed in here during {@link #getOptionsResult}.
*/
DetailedExitCode parseStarlarkOptions(CommandEnvironment env, ExtendedEventHandler eventHandler) {
// For now, restrict starlark options to commands that already build to ensure that loading
// will work. We may want to open this up to other commands in the future. The "info"
// and "clean" commands have builds=true set in their annotation but don't actually do any
// building (b/120041419).
if (!commandAnnotation.builds()
|| commandAnnotation.name().equals("info")
|| commandAnnotation.name().equals("clean")) {
return DetailedExitCode.success();
}
try {
StarlarkOptionsParser.newStarlarkOptionsParser(env, optionsParser).parse(eventHandler);
} catch (OptionsParsingException e) {
String logMessage = "Error parsing Starlark options";
logger.atInfo().withCause(e).log("%s", logMessage);
if (!commandAnnotation.builds()
|| commandAnnotation.name().equals("info")
|| commandAnnotation.name().equals("clean")) {
logger.atInfo().log("Skipping Starlark options due to parsing failure");
return DetailedExitCode.success();
}
return processOptionsParsingException(
eventHandler, e, logMessage, Code.STARLARK_OPTIONS_PARSE_FAILURE);
}
Expand Down