Avoid imorting from silver-platter.

This commit is contained in:
Jelmer Vernooij 2021-02-13 14:53:42 +00:00
parent efa2bdb894
commit 0133fb90ec
2 changed files with 9 additions and 10 deletions

View file

@ -35,16 +35,15 @@ from debmutate.changelog import get_maintainer, format_datetime
from breezy import osutils from breezy import osutils
from breezy.mutabletree import MutableTree from breezy.mutabletree import MutableTree
from silver_platter.debian import ( from breezy.plugins.debian.builder import BuildFailedError
BuildFailedError,
DEFAULT_BUILDER,
)
from buildlog_consultant.sbuild import ( from buildlog_consultant.sbuild import (
worker_failure_from_sbuild_log, worker_failure_from_sbuild_log,
SbuildFailure, SbuildFailure,
) )
DEFAULT_BUILDER = "sbuild --no-clean-source"
class MissingChangesFile(Exception): class MissingChangesFile(Exception):
"""Expected changes file was not written.""" """Expected changes file was not written."""

View file

@ -61,12 +61,13 @@ from debmutate._rules import (
dh_invoke_add_with, dh_invoke_add_with,
update_rules, 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 import Problem
from buildlog_consultant.common import ( from buildlog_consultant.common import (
MissingConfigStatusInput, MissingConfigStatusInput,
@ -110,7 +111,6 @@ from buildlog_consultant.sbuild import (
SbuildFailure, SbuildFailure,
) )
DEFAULT_MAX_ITERATIONS = 10 DEFAULT_MAX_ITERATIONS = 10