From 4a5ca6f9853938eec8b5e487dc6cb3728dfb6a15 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 22 Dec 2021 21:52:01 +0300 Subject: Adapt to package manifest dependency classes change --- mod/mod-package-version-details.cxx | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'mod/mod-package-version-details.cxx') diff --git a/mod/mod-package-version-details.cxx b/mod/mod-package-version-details.cxx index f1a641b..4a1f0c1 100644 --- a/mod/mod-package-version-details.cxx +++ b/mod/mod-package-version-details.cxx @@ -325,9 +325,6 @@ handle (request& rq, response& rs) s << TR(CLASS="depends") << TH; - if (das.conditional) - s << '?'; - if (das.buildtime) s << '*'; @@ -340,9 +337,30 @@ handle (request& rq, response& rs) if (&da != &das[0]) s << " | "; - assert (da.size () == 1); // @@ DEP + // Should we enclose multiple dependencies into curly braces as in the + // manifest? Somehow feels redundant here, since there can't be any + // ambiguity (dependency group version constraint is already punched + // into the specific dependencies without constraints). + // + for (const dependency& d: da) + { + if (&d != &da[0]) + s << ' '; + + print_dependency (d); + } + + if (da.enable) + { + s << " ? ("; - print_dependency (da[0]); + if (full) + s << *da.enable; + else + s << "..."; + + s << ')'; + } } s << ~SPAN -- cgit v1.1