diff --git a/ognibuild/debian/build.py b/ognibuild/debian/build.py index fab4568..2345981 100644 --- a/ognibuild/debian/build.py +++ b/ognibuild/debian/build.py @@ -35,16 +35,15 @@ from debmutate.changelog import get_maintainer, format_datetime from breezy import osutils from breezy.mutabletree import MutableTree -from silver_platter.debian import ( - BuildFailedError, - DEFAULT_BUILDER, -) +from breezy.plugins.debian.builder import BuildFailedError from buildlog_consultant.sbuild import ( worker_failure_from_sbuild_log, SbuildFailure, ) +DEFAULT_BUILDER = "sbuild --no-clean-source" + class MissingChangesFile(Exception): """Expected changes file was not written.""" diff --git a/ognibuild/debian/fix_build.py b/ognibuild/debian/fix_build.py index cf88224..4233126 100644 --- a/ognibuild/debian/fix_build.py +++ b/ognibuild/debian/fix_build.py @@ -61,12 +61,13 @@ from debmutate._rules import ( dh_invoke_add_with, update_rules, ) -from silver_platter.debian import ( - debcommit, - DEFAULT_BUILDER, -) -from .build import attempt_build, get_build_architecture +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 ( MissingConfigStatusInput, @@ -110,7 +111,6 @@ from buildlog_consultant.sbuild import ( SbuildFailure, ) - DEFAULT_MAX_ITERATIONS = 10