From 52b8694b5c0e86fbc5e3d0cc470cee286656b4d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
Date: Fri, 2 Apr 2021 16:20:59 +0100
Subject: [PATCH] Stop returning SbuildFailure.

---
 ognibuild/debian/build.py     | 44 +++++++++++++++++++++++++++++++----
 ognibuild/debian/fix_build.py | 21 +++++++++++------
 2 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/ognibuild/debian/build.py b/ognibuild/debian/build.py
index 8c35f89..c25b3d5 100644
--- a/ognibuild/debian/build.py
+++ b/ognibuild/debian/build.py
@@ -19,7 +19,8 @@ __all__ = [
     "get_build_architecture",
     "add_dummy_changelog_entry",
     "build",
-    "SbuildFailure",
+    "DetailedDebianBuildFailure",
+    "UnidentifiedDebianBuildError",
 ]
 
 from datetime import datetime
@@ -27,6 +28,7 @@ from debmutate.changelog import ChangelogEditor
 import logging
 import os
 import re
+import shlex
 import subprocess
 import sys
 
@@ -39,13 +41,33 @@ from breezy.tree import Tree
 
 from buildlog_consultant.sbuild import (
     worker_failure_from_sbuild_log,
-    SbuildFailure,
 )
 
+from .. import DetailedFailure as DetailedFailure, UnidentifiedError
+
 
 DEFAULT_BUILDER = "sbuild --no-clean-source"
 
 
+class DetailedDebianBuildFailure(DetailedFailure):
+
+    def __init__(self, stage, phase, retcode, argv, error, description):
+        super(DetailedDebianBuildFailure, self).__init__(retcode, argv, error)
+        self.stage = stage
+        self.phase = phase
+        self.description = description
+
+
+class UnidentifiedDebianBuildError(UnidentifiedError):
+
+    def __init__(self, stage, phase, retcode, argv, lines, description, secondary=None):
+        super(UnidentifiedDebianBuildError, self).__init__(
+            retcode, argv, lines, secondary)
+        self.stage = stage
+        self.phase = phase
+        self.description = description
+
+
 class MissingChangesFile(Exception):
     """Expected changes file was not written."""
 
@@ -200,9 +222,23 @@ def build_once(
                 subpath=subpath,
                 source_date_epoch=source_date_epoch,
             )
-    except BuildFailedError:
+    except BuildFailedError as e:
         with open(build_log_path, "rb") as f:
-            raise worker_failure_from_sbuild_log(f)
+            sbuild_failure = worker_failure_from_sbuild_log(f)
+            retcode = getattr(e, 'returncode', None)
+            if sbuild_failure.error:
+                raise DetailedDebianBuildFailure(
+                    sbuild_failure.stage,
+                    sbuild_failure.phase, retcode,
+                    shlex.split(build_command),
+                    sbuild_failure.error,
+                    sbuild_failure.description)
+            else:
+                raise UnidentifiedDebianBuildError(
+                    sbuild_failure.stage,
+                    sbuild_failure.phase,
+                    retcode, shlex.split(build_command),
+                    [], sbuild_failure.description)
 
     (cl_package, cl_version) = get_latest_changelog_version(local_tree, subpath)
     changes_names = []
diff --git a/ognibuild/debian/fix_build.py b/ognibuild/debian/fix_build.py
index 9db0774..4a2a112 100644
--- a/ognibuild/debian/fix_build.py
+++ b/ognibuild/debian/fix_build.py
@@ -111,10 +111,11 @@ from buildlog_consultant.common import (
     NeedPgBuildExtUpdateControl,
     MissingPerlFile,
 )
-from buildlog_consultant.sbuild import (
-    SbuildFailure,
-)
 
+from . import (
+    DetailedDebianBuildFailure,
+    UnidentifiedDebianBuildError,
+    )
 from ..buildlog import problem_to_upstream_requirement
 from ..fix_build import BuildFixer, resolve_error
 from ..resolver.apt import (
@@ -675,17 +676,23 @@ def main(argv=None):
                 update_changelog=args.update_changelog,
                 max_iterations=args.max_iterations,
             )
-        except SbuildFailure as e:
+        except DetailedDebianBuildFailure as e:
             if e.phase is None:
                 phase = "unknown phase"
             elif len(e.phase) == 1:
                 phase = e.phase[0]
             else:
                 phase = "%s (%s)" % (e.phase[0], e.phase[1])
-            if e.error:
-                logging.fatal("Error during %s: %s", phase, e.error)
+            logging.fatal("Error during %s: %s", phase, e.error)
+            return 1
+        except UnidentifiedDebianBuildError as e:
+            if e.phase is None:
+                phase = "unknown phase"
+            elif len(e.phase) == 1:
+                phase = e.phase[0]
             else:
-                logging.fatal("Error during %s: %s", phase, e.description)
+                phase = "%s (%s)" % (e.phase[0], e.phase[1])
+            logging.fatal("Error during %s: %s", phase, e.description)
             return 1
 
         logging.info(