billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use run_detecting_problems more.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-27 20:42:55 +00:00
parent cb6c10a992
commit ed6d9c8af1
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ognibuild/resolver/__init__.py
View file

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