diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2017-06-09 16:25:20 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-06-14 17:51:00 +0300 |
| commit | da701337ca32a54682a0daddcd2ab85a2f886a18 (patch) | |
| tree | db1c7cbbc6b64c4daf0d21c711ebb7583b98a765 /libbrep | |
| parent | 6afd16cfb93ca1cf943b7f304bf4b1ab781179b6 (diff) | |
Get rid of package configuration unbuilt state
Diffstat (limited to 'libbrep')
| -rw-r--r-- | libbrep/build.cxx | 4 | ||||
| -rw-r--r-- | libbrep/build.hxx | 7 | ||||
| -rw-r--r-- | libbrep/build.xml | 4 |
3 files changed, 5 insertions, 10 deletions
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"/> |