From 3cc61ab4a6275428520cb0fb2f18dc3e09aef28a Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 13 Mar 2023 13:25:08 +0200 Subject: Move os-release facility to libbutl --- bpkg/system-package-manager.cxx | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'bpkg/system-package-manager.cxx') diff --git a/bpkg/system-package-manager.cxx b/bpkg/system-package-manager.cxx index 793dec6..9e54418 100644 --- a/bpkg/system-package-manager.cxx +++ b/bpkg/system-package-manager.cxx @@ -30,6 +30,17 @@ namespace bpkg // vtable } + static optional + host_release (const target_triplet& host) + try + { + return butl::host_os_release (host); + } + catch (const runtime_error& e) + { + fail << "unable to determine host operating system release: " << e << endf; + } + // Return true if the specified operating system is or like the specified // id. // @@ -66,7 +77,7 @@ namespace bpkg unique_ptr r; - if (optional oos = host_os_release (host)) + if (optional oos = host_release (host)) { os_release& os (*oos); @@ -138,7 +149,7 @@ namespace bpkg unique_ptr r; - if (optional oos = host_os_release (host)) + if (optional oos = host_release (host)) { os_release& os (*oos); -- cgit v1.1