Make use of foreign package objects in build-related functionality

1 files changed, 5 insertions, 19 deletions

diff --git a/mod/mod-build-force.cxx b/mod/mod-build-force.cxx
index 325a1c7..a1d424c 100644
--- a/mod/mod-build-force.cxx
+++ b/mod/mod-build-force.cxx
@@ -13,8 +13,6 @@
 
 #include <libbrep/build.hxx>
 #include <libbrep/build-odb.hxx>
-#include <libbrep/package.hxx>
-#include <libbrep/package-odb.hxx>
 
 #include <mod/options.hxx>
 
@@ -42,9 +40,6 @@ init (scanner& s)
   options_ = make_shared<options::build_force> (
     s, unknown_mode::fail, unknown_mode::fail);
 
-  database_module::init (static_cast<options::package_db> (*options_),
-                         options_->package_db_retry ());
-
   if (options_->build_config_specified ())
     database_module::init (static_cast<options::build>    (*options_),
                            static_cast<options::build_db> (*options_),
@@ -145,27 +140,18 @@ handle (request& rq, response& rs)
       build_conf_map_->end ())
     config_expired ("no configuration");
 
-  // Make sure the package still exists.
-  //
-  {
-    transaction t (package_db_->begin ());
-    shared_ptr<package> p (package_db_->find<package> (id.package));
-    t.commit ();
-
-    if (p == nullptr)
-      config_expired ("no package");
-  }
-
   // Load the package build configuration (if present), set the force flag and
   // update the object's persistent state.
   //
   {
     transaction t (build_db_->begin ());
-    shared_ptr<build> b (build_db_->find<build> (id));
 
-    if (b == nullptr)
-      config_expired ("no package configuration");
+    package_build pb;
+    if (!build_db_->query_one<package_build> (
+          query<package_build>::build::id == id, pb))
+      config_expired ("no package build");
 
+    shared_ptr<build> b (pb.build);
     force_state force (b->state == build_state::built
                        ? force_state::forced
                        : force_state::forcing);