From 9870c12a33c2eb87320d718b3d47b7313c21c4a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
Date: Mon, 8 Feb 2021 17:35:08 +0000
Subject: [PATCH] Fix compatibility with newer buildlog-consultant.

---
 ognibuild/debian/__init__.py             |  4 ++--
 ognibuild/debian/fix_build.py            | 12 ++++++++----
 ognibuild/dist.py                        | 15 ++++++++++++++-
 ognibuild/tests/test_debian_fix_build.py |  2 +-
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/ognibuild/debian/__init__.py b/ognibuild/debian/__init__.py
index 3fffa9a..9d64ab8 100644
--- a/ognibuild/debian/__init__.py
+++ b/ognibuild/debian/__init__.py
@@ -17,8 +17,8 @@
 
 from debian.deb822 import Deb822
 
-from .apt import AptManager
-from .session import Session
+from ..apt import AptManager
+from ..session import Session
 
 
 # TODO(jelmer): move this to debian/
diff --git a/ognibuild/debian/fix_build.py b/ognibuild/debian/fix_build.py
index 9aa728d..16b4e92 100644
--- a/ognibuild/debian/fix_build.py
+++ b/ognibuild/debian/fix_build.py
@@ -68,8 +68,8 @@ from silver_platter.debian import (
 
 from breezy.plugins.debian.util import get_build_architecture
 from .build import attempt_build
-from buildlog_consultant.sbuild import (
-    Problem,
+from buildlog_consultant import Problem
+from buildlog_consultant.common import (
     MissingConfigStatusInput,
     MissingPythonModule,
     MissingPythonDistribution,
@@ -99,13 +99,17 @@ from buildlog_consultant.sbuild import (
     MissingXfceDependency,
     MissingHaskellDependencies,
     NeedPgBuildExtUpdateControl,
-    SbuildFailure,
     DhAddonLoadFailure,
-    AptFetchFailure,
     MissingMavenArtifacts,
     GnomeCommonMissing,
     MissingGnomeCommonDependency,
     )
+from buildlog_consultant.apt import (
+    AptFetchFailure,
+    )
+from buildlog_consultant.sbuild import (
+    SbuildFailure,
+    )
 
 
 DEFAULT_MAX_ITERATIONS = 10
diff --git a/ognibuild/dist.py b/ognibuild/dist.py
index 8499e0c..a7130da 100644
--- a/ognibuild/dist.py
+++ b/ognibuild/dist.py
@@ -30,7 +30,20 @@ from breezy.workingtree import WorkingTree
 
 from breezy.plugins.debian.repack_tarball import get_filetype
 
-from buildlog_consultant.sbuild import (
+from . import apt, DetailedFailure, shebang_binary
+from .buildsystem import detect_buildsystems, NoBuildToolsFound
+from .session import run_with_tee, Session
+from .session.schroot import SchrootSession
+from .debian.fix_build import (
+    DependencyContext,
+    resolve_error,
+    APT_FIXERS,
+    )
+from buildlog_consultant.common import (
+    find_build_failure_description,
+    Problem,
+    MissingPerlModule,
+    MissingCommand,
     NoSpaceOnDevice,
     )
 
diff --git a/ognibuild/tests/test_debian_fix_build.py b/ognibuild/tests/test_debian_fix_build.py
index 7b0fa18..68e1c63 100644
--- a/ognibuild/tests/test_debian_fix_build.py
+++ b/ognibuild/tests/test_debian_fix_build.py
@@ -19,7 +19,7 @@ import re
 
 from debian.deb822 import Deb822
 
-from buildlog_consultant.sbuild import (
+from buildlog_consultant.common import (
     MissingCommand,
     MissingGoPackage,
     MissingPerlModule,