From 6ce19c537bd9de8d3c9821841bc5ed680b762742 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 24 May 2018 00:25:45 +0300 Subject: Adapt to inventing package_name type --- mod/mod-build-result.cxx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'mod/mod-build-result.cxx') diff --git a/mod/mod-build-result.cxx b/mod/mod-build-result.cxx index 024502a..1253d14 100644 --- a/mod/mod-build-result.cxx +++ b/mod/mod-build-result.cxx @@ -117,9 +117,12 @@ handle (request& rq, response&) if (p == string::npos) throw invalid_argument ("no package version"); - string& name (rqm.result.name); - if (name.compare (0, name.size (), s, 0, p) != 0) - throw invalid_argument ("package name mismatch"); + package_name& name (rqm.result.name); + { + const string& n (name.string ()); + if (n.compare (0, n.size (), s, 0, p) != 0) + throw invalid_argument ("package name mismatch"); + } size_t b (p + 1); // Start of version. p = s.find ('/', b); // End of version. @@ -383,7 +386,8 @@ handle (request& rq, response&) try { string subj ((unforced ? "build " : "rebuild ") + - to_string (*b->status) + ": " + b->package_name + '/' + + to_string (*b->status) + ": " + + b->package_name.string () + '/' + b->package_version.string () + '/' + b->configuration + '/' + b->toolchain_name + '-' + b->toolchain_version.string ()); -- cgit v1.1