From 0ef3a14aa276647d4035380b6d7c49bbeece0ac1 Mon Sep 17 00:00:00 2001 From: Danny McClanahan <1305167+cosmicexplorer@users.noreply.github.com> Date: Wed, 6 Feb 2019 17:40:08 -0800 Subject: [PATCH] use ZincCompileError for fun --- .../pants/backend/jvm/tasks/jvm_compile/zinc/zinc_compile.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/python/pants/backend/jvm/tasks/jvm_compile/zinc/zinc_compile.py b/src/python/pants/backend/jvm/tasks/jvm_compile/zinc/zinc_compile.py index a3d73cc967a6..b865a8100484 100644 --- a/src/python/pants/backend/jvm/tasks/jvm_compile/zinc/zinc_compile.py +++ b/src/python/pants/backend/jvm/tasks/jvm_compile/zinc/zinc_compile.py @@ -401,7 +401,8 @@ def relative_to_exec_root(path): self.NAILGUN: lambda: self._compile_nonhermetic(jvm_options, zinc_args), })() - class ZincCompileError(TaskError): pass + class ZincCompileError(TaskError): + """An exception type specifically to signal a failed zinc execution.""" def _compile_nonhermetic(self, jvm_options, zinc_args): exit_code = self.runjava(classpath=self.get_zinc_compiler_classpath(), @@ -462,7 +463,7 @@ def _compile_hermetic(self, jvm_options, ctx, classes_dir, zinc_args, compiler_b req, self.name(), [WorkUnitLabel.COMPILER]) if res.exit_code != 0: - raise TaskError(res.stderr, exit_code=res.exit_code) + raise self.ZincCompileError(res.stderr, exit_code=res.exit_code) # TODO: Materialize as a batch in do_compile or somewhere self.context._scheduler.materialize_directories((