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

Avoid using silver-platter.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-02-13 14:52:09 +00:00
parent ee5a8462f3
commit b689774fa6
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ognibuild/debian/build.py
View file

@ -35,13 +35,15 @@ from debmutate.changelog import get_maintainer, format_datetime
from breezy import osutils
from breezy.mutabletree import MutableTree
from breezy.plugins.debian.util import BuildFailedError
from breezy.plugins.debian.builder import BuildFailedError
from buildlog_consultant.sbuild import (
worker_failure_from_sbuild_log,
SbuildFailure,
)
DEFAULT_BUILDER = "sbuild --no-clean-source"
DEFAULT_BUILDER = "sbuild --no-clean-source"

7
ognibuild/debian/fix_build.py
View file

@ -62,11 +62,6 @@ from debmutate._rules import (
update_rules,
)
from .build import (
attempt_build,
get_build_architecture,
DEFAULT_BUILDER,
)
from breezy.plugins.debian.changelog import debcommit
from buildlog_consultant import Problem
from buildlog_consultant.common import (
@ -114,7 +109,7 @@ from buildlog_consultant.sbuild import (
from ..apt import AptManager, LocalAptManager
from ..resolver.apt import AptResolver
from ..requirements import BinaryRequirement
from .build import attempt_build
from .build import attempt_build, DEFAULT_BUILDER
DEFAULT_MAX_ITERATIONS = 10