From d6500b9d7ee5cf68a7507f9d4d726ffb767d827a Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 1 Feb 2023 13:47:47 +0300 Subject: Implement system package manager query and install support for Fedora Note that the main/devel name resolution based on the project name still needs to be fixed. --- bpkg/system-package-manager-debian.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bpkg/system-package-manager-debian.cxx') diff --git a/bpkg/system-package-manager-debian.cxx b/bpkg/system-package-manager-debian.cxx index 998c4f4..4cad141 100644 --- a/bpkg/system-package-manager-debian.cxx +++ b/bpkg/system-package-manager-debian.cxx @@ -62,6 +62,7 @@ namespace bpkg if (pn != nullptr && pn->string ().compare (0, 3, "lib") == 0 && + pn->string ().size () > 3 && suffix (m, "-dev") && !(ns.size () > 1 && suffix (ns[1], "-dev"))) { @@ -909,7 +910,7 @@ namespace bpkg // non-libraries with the lib prefix (both of which we do not // recomment) will have to provide a manual mapping. // - if (n.compare (0, 3, "lib") == 0) + if (n.compare (0, 3, "lib") == 0 && n.size () > 3) { // Keep the main package name empty as an indication that it is to // be discovered. @@ -1283,7 +1284,7 @@ namespace bpkg assert (install_ && !installed_); installed_ = true; - // Collect and merge all the Debian packages/version for the specified + // Collect and merge all the Debian packages/versions for the specified // bpkg packages. // struct package -- cgit v1.1