Merge pull request #346 from tmolteno/master

Update the casa backend to split the wrapper. Issue #121, #122

stimela/backends/flavours/casa.py

@@ -29,7 +29,8 @@ def finalize(self, cab: Cab):
         super().finalize(cab)
 
         # catch CASA error messages, except the MeasTable::dUTC complaints which are all-pervasive
-        err_patt = re.compile("(?P<content>(\tSEVERE\s+(?!MeasTable::dUTC)|ABORTING|\*\*\* Error \*\*\*)(.*))$")
+        rex = "(?P<content>(\tSEVERE\\s+(?!([a-z]+::)?MeasTable::dUTC)|ABORTING|\\*\\*\\* Error \\*\\*\\*)(.*))$"
+        err_patt = re.compile(rex)
         cab._wranglers.append((
             err_patt, [
                 wranglers.DeclareError(err_patt, "ERROR", message="CASA error: {content}" )
@@ -64,7 +65,7 @@ def get_arguments(self, cab: Cab, params: Dict[str, Any], subst: Dict[str, Any],
             wrapper = self.wrapper if self.wrapper is not None else casa_config.get('wrapper', 'xvfb-run -a')
             if wrapper:
                 try:
-                    wrapper = [context.evaluate(wrapper, location=["wrapper"])]
+                    wrapper = context.evaluate(wrapper, location=["wrapper"]).split()
                 except Exception as exc:
                     raise SubstitutionError(f"error substituting wrapper '{wrapper}'", exc)
             else: