Skip to content

fix persistent worker param file parsing #6

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: lucid
Choose a base branch
from
Draft

fix persistent worker param file parsing #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions aspect/tools/src/com/google/idea/blaze/aspect/PackageParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ static final class PackageParserOptions {

@VisibleForTesting
static PackageParserOptions parseArgs(String[] args) {
args = parseParamFileIfUsed(args);
PackageParserOptions options = new PackageParserOptions();
options.sources =
OptionParser.parseSingleOption(args, "sources", ArtifactLocationParser::parseList);
Expand Down Expand Up @@ -115,7 +114,7 @@ private static void runPersistentWorker(PackageParser parser) throws IOException

public static void main(String[] args) throws Exception {
ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
PackageParserOptions options = parseArgs(args);
args = parseParamFileIfUsed(args);
PackageParser parser = new PackageParser(PackageParserIoProvider.INSTANCE, executorService);

try {
Expand All @@ -125,6 +124,7 @@ public static void main(String[] args) throws Exception {
// redirect log output away from stdout.
runPersistentWorker(parser);
} else {
PackageParserOptions options = parseArgs(args);
parsePackagesAndWriteManifest(parser, options);
}
} catch (Throwable e) {
Expand Down