Detect problems when running resolver.

ognibuild/fix_build.py

@@ -63,11 +63,9 @@ class DependencyContext(object):
         raise NotImplementedError(self.add_dependency)
 
 
-def run_with_build_fixers(session: Session, args: List[str], fixers: List[BuildFixer], env: Optional[Dict[str, str]] = None):
+def run_detecting_problems(session: Session, args: List[str], **kwargs):
-    fixed_errors = []
-    while True:
     try:
-            retcode, contents = run_with_tee(session, args, env=env)
+        retcode, contents = run_with_tee(session, args, **kwargs)
     except FileNotFoundError:
         error = MissingCommand(args[0])
         retcode = 1
@@ -83,21 +81,27 @@ def run_with_build_fixers(session: Session, args: List[str], fixers: List[BuildF
             else:
                 logging.warning("Build failed and unable to find cause. Giving up.")
             raise UnidentifiedError(retcode, args, lines, secondary=match)
+    raise DetailedFailure(retcode, args, error)
 
-        logging.info("Identified error: %r", error)
+
-        if error in fixed_errors:
+def run_with_build_fixers(session: Session, args: List[str], fixers: List[BuildFixer], **kwargs):
+    fixed_errors = []
+    while True:
+        try:
+            run_detecting_problems(session, args, **kwargs)
+        except DetailedFailure as e:
+            logging.info("Identified error: %r", e.error)
+            if e.error in fixed_errors:
                 logging.warning(
-                "Failed to resolve error %r, it persisted. Giving up.", error
+                    "Failed to resolve error %r, it persisted. Giving up.", e.error
                 )
-            raise DetailedFailure(retcode, args, error)
+                raise DetailedFailure(e.retcode, args, e.error)
-        if not resolve_error(
+            if not resolve_error(e.error, None, fixers=fixers):
-            error,
+                logging.warning("Failed to find resolution for error %r. Giving up.", e.error)
-            None,
+                raise DetailedFailure(e.retcode, args, e.error)
-            fixers=fixers,
+            fixed_errors.append(e.error)
-        ):
+        else:
-            logging.warning("Failed to find resolution for error %r. Giving up.", error)
+            return
-            raise DetailedFailure(retcode, args, error)
-        fixed_errors.append(error)
 
 
 def resolve_error(error, context, fixers):

ognibuild/resolver/__init__.py

@@ -17,7 +17,7 @@
 
 
 import subprocess
-
+from ..fix_build import run_detecting_problems
 
 class UnsatisfiedRequirements(Exception):
     def __init__(self, reqs):
@@ -80,7 +80,7 @@ class CPANResolver(Resolver):
                 missing.append(requirement)
                 continue
             # TODO(jelmer): Specify -T to skip tests?
-            self.session.check_call(
+            run_detecting_problems(self.session,
                 ["cpan", "-i", requirement.module],
                 env=env,
                 user=user,