aboutsummaryrefslogtreecommitdiff
path: root/bbot/worker/worker.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-10-05 12:37:06 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-10-05 12:37:06 +0200
commit1514398c7189409b02f445c93755ef179c7c13d7 (patch)
tree9219882832259ab3267ee0baac4023b418c0cce8 /bbot/worker/worker.cxx
parent346e7d9d4de6b37af7ec156db4cda892ab804634 (diff)
Fix another bug in worker upload logic
Diffstat (limited to 'bbot/worker/worker.cxx')
-rw-r--r--bbot/worker/worker.cxx9
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