From b689774fa6b254699ef3765b39bd81e0611fcf13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
Date: Sat, 13 Feb 2021 14:52:09 +0000
Subject: [PATCH] Avoid using silver-platter.

---
 ognibuild/debian/build.py     | 4 +++-
 ognibuild/debian/fix_build.py | 7 +------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ognibuild/debian/build.py b/ognibuild/debian/build.py
index 04b2fe3..b19c640 100644
--- a/ognibuild/debian/build.py
+++ b/ognibuild/debian/build.py
@@ -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"
 
diff --git a/ognibuild/debian/fix_build.py b/ognibuild/debian/fix_build.py
index 2e8848e..71ee188 100644
--- a/ognibuild/debian/fix_build.py
+++ b/ognibuild/debian/fix_build.py
@@ -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