From da701337ca32a54682a0daddcd2ab85a2f886a18 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 9 Jun 2017 16:25:20 +0300
Subject: Get rid of package configuration unbuilt state

---
 libbrep/build.cxx | 4 +---
 libbrep/build.hxx | 7 ++-----
 libbrep/build.xml | 4 ++--
 3 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'libbrep')

diff --git a/libbrep/build.cxx b/libbrep/build.cxx
index 0941c5f..78a3a2d 100644
--- a/libbrep/build.cxx
+++ b/libbrep/build.cxx
@@ -13,7 +13,6 @@ namespace brep
   {
     switch (s)
     {
-    case build_state::unbuilt:  return "unbuilt";
     case build_state::building: return "building";
     case build_state::built:    return "built";
     }
@@ -24,8 +23,7 @@ namespace brep
   build_state
   to_build_state (const string& s)
   {
-         if (s == "unbuilt")  return build_state::unbuilt;
-    else if (s == "building") return build_state::building;
+         if (s == "building") return build_state::building;
     else if (s == "built")    return build_state::built;
     else throw invalid_argument ("invalid build state '" + s + "'");
   }
diff --git a/libbrep/build.hxx b/libbrep/build.hxx
index 6b58402..dd6f10d 100644
--- a/libbrep/build.hxx
+++ b/libbrep/build.hxx
@@ -64,7 +64,6 @@ namespace brep
   //
   enum class build_state: std::uint8_t
   {
-    unbuilt,
     building,
     built
   };
@@ -176,10 +175,8 @@ namespace brep
     optional<string> agent_fingerprint;
     optional<string> agent_challenge;
 
-    // Present only for building and built states.
-    //
-    optional<string> machine;
-    optional<string> machine_summary;
+    string machine;
+    string machine_summary;
 
     // Default for the machine if absent.
     //
diff --git a/libbrep/build.xml b/libbrep/build.xml
index cee65ac..5b45d6d 100644
--- a/libbrep/build.xml
+++ b/libbrep/build.xml
@@ -22,8 +22,8 @@
       <column name="status" type="TEXT" null="true"/>
       <column name="agent_fingerprint" type="TEXT" null="true"/>
       <column name="agent_challenge" type="TEXT" null="true"/>
-      <column name="machine" type="TEXT" null="true"/>
-      <column name="machine_summary" type="TEXT" null="true"/>
+      <column name="machine" type="TEXT" null="false"/>
+      <column name="machine_summary" type="TEXT" null="false"/>
       <column name="target" type="TEXT" null="true"/>
       <primary-key>
         <column name="package_name"/>
-- 
cgit v1.1