Fix worker not to redefine upload-status result manifest value

1 files changed, 12 insertions, 1 deletions

diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index 366d75a..985d77e 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -5664,7 +5664,18 @@ build (size_t argc, const char* argv[])
                *bkp_step >= step_id::bbot_upload &&
                *bkp_step <= step_id::bbot_upload_tar_list)
       {
-        fail_unreached_breakpoint (add_result ("upload"));
+        // If the upload operation log have been added as part of the build
+        // artifacts preparation for upload, then use this log to report the
+        // error. Otherwise, add the new log for that.
+        //
+        // @@ TMP: Apple Clang 14.0.3 ICE
+        //
+        operation_result* pr (&rm.results.back ());
+
+        if (pr->operation != "upload")
+          pr = &add_result ("upload");
+
+        fail_unreached_breakpoint (*pr);
         break;
       }
     }