From 05ef8418b7d644c93d6121a3c26ee4a0a50309ef Mon Sep 17 00:00:00 2001
From: Francois Kritzinger <francois@codesynthesis.com>
Date: Wed, 24 Apr 2024 09:49:23 +0200
Subject: Revert "Also pass build hints to build_building() and build_built()"

This reverts commit 9aa7ca59da55089e6f00733476356ef90bef25d2.
---
 mod/tenant-service.hxx | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

(limited to 'mod/tenant-service.hxx')

diff --git a/mod/tenant-service.hxx b/mod/tenant-service.hxx
index 3f1896b..c46cb7b 100644
--- a/mod/tenant-service.hxx
+++ b/mod/tenant-service.hxx
@@ -18,20 +18,6 @@ namespace brep
   class tenant_service_base
   {
   public:
-
-    // The build_hints can be used to omit certain components from the build
-    // id. If single_package_version is true, then this tenant contains a
-    // single (non-test) package version and this package name and package
-    // version can be omitted. If single_package_config is true, then the
-    // package version being built only has the default package configuration
-    // and thus it can be omitted.
-    //
-    struct build_hints
-    {
-      bool single_package_version;
-      bool single_package_config;
-    };
-
     virtual ~tenant_service_base () = default;
   };
 
@@ -100,11 +86,24 @@ namespace brep
     // the function name suffix (_queued, _building, _built) signify the
     // logical end state.
     //
+    // The build_queued_hints can be used to omit certain components from the
+    // build id. If single_package_version is true, then this tenant contains
+    // a single (non-test) package version and this package name and package
+    // version can be omitted. If single_package_config is true, then the
+    // package version being built only has the default package configuration
+    // and thus it can be omitted.
+    //
+    struct build_queued_hints
+    {
+      bool single_package_version;
+      bool single_package_config;
+    };
+
     virtual function<optional<string> (const tenant_service&)>
     build_queued (const tenant_service&,
                   const vector<build>&,
                   optional<build_state> initial_state,
-                  const build_hints&,
+                  const build_queued_hints&,
                   const diag_epilogue& log_writer) const noexcept = 0;
   };
 
@@ -114,7 +113,6 @@ namespace brep
     virtual function<optional<string> (const tenant_service&)>
     build_building (const tenant_service&,
                     const build&,
-                    const build_hints&,
                     const diag_epilogue& log_writer) const noexcept = 0;
   };
 
@@ -124,7 +122,6 @@ namespace brep
     virtual function<optional<string> (const tenant_service&)>
     build_built (const tenant_service&,
                  const build&,
-                 const build_hints&,
                  const diag_epilogue& log_writer) const noexcept = 0;
   };
 
-- 
cgit v1.1