Fix another bug in worker upload logic

1 files changed, 7 insertions, 2 deletions

diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index 12e5fde..85b3265 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -1437,12 +1437,17 @@ build (size_t argc, const char* argv[])
                  "--tftp-blksize", tftp_blksize,
                  "--max-time", tftp_put_timeout);
 
-    serialize_manifest (rm, c.out, url, "result");
-    c.out.close ();
+    manifest_serializer s (c.out, url);
+    rm.serialize (s);
 
+    c.out.close ();
     if (!c.wait ())
       throw_generic_error (EIO);
   }
+  catch (const manifest_serialization& e)
+  {
+    fail << "invalid result manifest: " << e.description;
+  }
   catch (const system_error& e)
   {
     // We use exit code 3 to signal an unsuccessful attempt to upload the