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

Use auto_resolver rather than apt resolver.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-21 18:57:24 +00:00
parent 45e0f797e4
commit c5a278729e
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ognibuild/dist.py
View file

@ -42,6 +42,7 @@ from buildlog_consultant.common import (
from . import DetailedFailure, UnidentifiedError from . import DetailedFailure, UnidentifiedError
from .buildsystem import NoBuildToolsFound from .buildsystem import NoBuildToolsFound
from .resolver import auto_resolver
from .session import Session from .session import Session
from .session.schroot import SchrootSession from .session.schroot import SchrootSession
@ -138,7 +139,6 @@ def create_dist(
subdir: Optional[str] = None, subdir: Optional[str] = None,
) -> Optional[str]: ) -> Optional[str]:
from .buildsystem import detect_buildsystems from .buildsystem import detect_buildsystems
from .resolver.apt import AptResolver
from .buildlog import InstallFixer from .buildlog import InstallFixer
if subdir is None: if subdir is None:
@ -158,7 +158,7 @@ def create_dist(
raise raise
buildsystems = list(detect_buildsystems(export_directory)) buildsystems = list(detect_buildsystems(export_directory))
resolver = AptResolver.from_session(session) resolver = auto_resolver(session)
fixers = [InstallFixer(resolver)] fixers = [InstallFixer(resolver)]
with DistCatcher(export_directory) as dc: with DistCatcher(export_directory) as dc: