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

Some more logging.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-30 19:39:35 +01:00
parent d906ec1d1c
commit 7d1b7ed4ed
2 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ognibuild/debian/apt.py
View file

@ -41,6 +41,7 @@ def run_apt(
if prefix is None: if prefix is None:
prefix = [] prefix = []
args = prefix = ["apt", "-y"] + args args = prefix = ["apt", "-y"] + args
logging.info('apt: running %r', args)
retcode, lines = run_with_tee(session, args, cwd="/", user="root") retcode, lines = run_with_tee(session, args, cwd="/", user="root")
if retcode == 0: if retcode == 0:
return return

32
ognibuild/resolver/__init__.py
View file

@ -16,6 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import logging
import subprocess import subprocess
from ..fix_build import run_detecting_problems from ..fix_build import run_detecting_problems
@ -88,9 +89,11 @@ class CPANResolver(Resolver):
if not isinstance(requirement, PerlModuleRequirement): if not isinstance(requirement, PerlModuleRequirement):
missing.append(requirement) missing.append(requirement)
continue continue
cmd = self._cmd([requirement])
logging.info("CPAN: running %r", cmd)
run_detecting_problems( run_detecting_problems(
self.session, self.session,
self._cmd([requirement]), cmd,
env=env, env=env,
user=user, user=user,
) )
@ -142,7 +145,9 @@ class RResolver(Resolver):
if not isinstance(requirement, RPackageRequirement): if not isinstance(requirement, RPackageRequirement):
missing.append(requirement) missing.append(requirement)
continue continue
run_detecting_problems(self.session, self._cmd(requirement), user=user) cmd = self._cmd(requirement)
logging.info("RResolver(%r): running %r", self.repos, cmd)
run_detecting_problems(self.session, cmd, user=user)
if missing: if missing:
raise UnsatisfiedRequirements(missing) raise UnsatisfiedRequirements(missing)
@ -186,7 +191,9 @@ class OctaveForgeResolver(Resolver):
if not isinstance(requirement, OctavePackageRequirement): if not isinstance(requirement, OctavePackageRequirement):
missing.append(requirement) missing.append(requirement)
continue continue
run_detecting_problems(self.session, self._cmd(requirement), user=user) cmd = self._cmd(requirement)
logging.info("Octave: running %r", cmd)
run_detecting_problems(self.session, cmd, user=user)
if missing: if missing:
raise UnsatisfiedRequirements(missing) raise UnsatisfiedRequirements(missing)
@ -235,7 +242,9 @@ class HackageResolver(Resolver):
if not isinstance(requirement, HaskellPackageRequirement): if not isinstance(requirement, HaskellPackageRequirement):
missing.append(requirement) missing.append(requirement)
continue continue
run_detecting_problems(self.session, self._cmd([requirement]), user=user) cmd = self._cmd([requirement])
logging.info("Hackage: running %r", cmd)
run_detecting_problems(self.session, cmd, user=user)
if missing: if missing:
raise UnsatisfiedRequirements(missing) raise UnsatisfiedRequirements(missing)
@ -281,8 +290,10 @@ class PypiResolver(Resolver):
if not isinstance(requirement, PythonPackageRequirement): if not isinstance(requirement, PythonPackageRequirement):
missing.append(requirement) missing.append(requirement)
continue continue
cmd = self._cmd([requirement])
logging.info("pip: running %r", cmd)
try: try:
run_detecting_problems(self.session, self._cmd([requirement]), user=user) run_detecting_problems(self.session, cmd, user=user)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
missing.append(requirement) missing.append(requirement)
if missing: if missing:
@ -325,7 +336,9 @@ class GoResolver(Resolver):
if not isinstance(requirement, GoPackageRequirement): if not isinstance(requirement, GoPackageRequirement):
missing.append(requirement) missing.append(requirement)
continue continue
run_detecting_problems(self.session, ["go", "get", requirement.package], env=env) cmd = ["go", "get", requirement.package]
logging.info("go: running %r", cmd)
run_detecting_problems(self.session, cmd, env=env)
if missing: if missing:
raise UnsatisfiedRequirements(missing) raise UnsatisfiedRequirements(missing)
@ -387,10 +400,9 @@ class NpmResolver(Resolver):
if not isinstance(requirement, NodePackageRequirement): if not isinstance(requirement, NodePackageRequirement):
missing.append(requirement) missing.append(requirement)
continue continue
run_detecting_problems( cmd = ["npm", "-g", "install", requirement.package]
self.session, logging.info("npm: running %r", cmd)
["npm", "-g", "install", requirement.package], user=user run_detecting_problems(self.session, cmd, user=user)
)
if missing: if missing:
raise UnsatisfiedRequirements(missing) raise UnsatisfiedRequirements(missing)