Update tenant service data in ci_start::rebuild()

1 files changed, 22 insertions, 1 deletions

diff --git a/mod/ci-common.cxx b/mod/ci-common.cxx
index 5b039ef..c7dfdb9 100644
--- a/mod/ci-common.cxx
+++ b/mod/ci-common.cxx
@@ -819,10 +819,16 @@ namespace brep
   }
 
   optional<build_state> ci_start::
-  rebuild (odb::core::database& db, const build_id& id) const
+  rebuild (odb::core::database& db,
+           const build_id& id,
+           function<optional<string> (const tenant_service&,
+                                      build_state)> uf) const
   {
     using namespace odb::core;
 
+    //@@@ Should we not retry transactions (here and in other functions that
+    //    update)?
+
     // NOTE: don't forget to update build_force::handle() if changing anything
     //       here.
     //
@@ -850,6 +856,21 @@ namespace brep
         b->force = force;
         db.update (b);
       }
+
+      if (uf != nullptr)
+      {
+        shared_ptr<build_tenant> t (db.load<build_tenant> (b->tenant));
+
+        assert (t->service);
+
+        tenant_service& ts (*t->service);
+
+        if (optional<string> data = uf (ts, s))
+        {
+          ts.data = move (*data);
+          db.update (t);
+        }
+      }
     }
 
     t.commit ();