From ed6d9c8af19f7bf91bf25694a0bc90a652bb95b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
Date: Sat, 27 Mar 2021 20:42:55 +0000
Subject: [PATCH] Use run_detecting_problems more.

---
 ognibuild/resolver/__init__.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ognibuild/resolver/__init__.py b/ognibuild/resolver/__init__.py
index 7451481..4e72bc5 100644
--- a/ognibuild/resolver/__init__.py
+++ b/ognibuild/resolver/__init__.py
@@ -142,7 +142,7 @@ class RResolver(Resolver):
             if not isinstance(requirement, RPackageRequirement):
                 missing.append(requirement)
                 continue
-            self.session.check_call(self._cmd(requirement), user=user)
+            run_detecting_problems(self.session, self._cmd(requirement), user=user)
         if missing:
             raise UnsatisfiedRequirements(missing)
 
@@ -186,7 +186,7 @@ class OctaveForgeResolver(Resolver):
             if not isinstance(requirement, OctavePackageRequirement):
                 missing.append(requirement)
                 continue
-            self.session.check_call(self._cmd(requirement), user=user)
+            run_detecting_problems(self.session, self._cmd(requirement), user=user)
         if missing:
             raise UnsatisfiedRequirements(missing)
 
@@ -235,7 +235,7 @@ class HackageResolver(Resolver):
             if not isinstance(requirement, HaskellPackageRequirement):
                 missing.append(requirement)
                 continue
-            self.session.check_call(self._cmd([requirement]), user=user)
+            run_detecting_problems(self.session, self._cmd([requirement]), user=user)
         if missing:
             raise UnsatisfiedRequirements(missing)
 
@@ -282,7 +282,7 @@ class PypiResolver(Resolver):
                 missing.append(requirement)
                 continue
             try:
-                self.session.check_call(self._cmd([requirement]), user=user)
+                run_detecting_problems(self.session, self._cmd([requirement]), user=user)
             except subprocess.CalledProcessError:
                 missing.append(requirement)
         if missing:
@@ -325,7 +325,7 @@ class GoResolver(Resolver):
             if not isinstance(requirement, GoPackageRequirement):
                 missing.append(requirement)
                 continue
-            self.session.check_call(["go", "get", requirement.package], env=env)
+            run_detecting_problems(self.session, ["go", "get", requirement.package], env=env)
         if missing:
             raise UnsatisfiedRequirements(missing)
 
@@ -386,7 +386,8 @@ class NpmResolver(Resolver):
             if not isinstance(requirement, NodePackageRequirement):
                 missing.append(requirement)
                 continue
-            self.session.check_call(
+            run_detecting_problems(
+                self.session,
                 ["npm", "-g", "install", requirement.package], user=user
             )
         if missing: