diff options
Diffstat (limited to 'bpkg/system-package-manager.cxx')
| -rw-r--r-- | bpkg/system-package-manager.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bpkg/system-package-manager.cxx b/bpkg/system-package-manager.cxx index caf951f..2ec7a60 100644 --- a/bpkg/system-package-manager.cxx +++ b/bpkg/system-package-manager.cxx @@ -53,10 +53,14 @@ namespace bpkg { // Note: similar to make_consumption_system_package_manager() below. - optional<bool> progress (co.progress () ? true : + optional<bool> progress (co.progress () ? true : co.no_progress () ? false : optional<bool> ()); + optional<size_t> fetch_timeout (co.fetch_timeout_specified () + ? co.fetch_timeout () + : optional<size_t> ()); + unique_ptr<system_package_manager> r; if (optional<os_release> oos = host_os_release (host)) @@ -80,7 +84,7 @@ namespace bpkg r.reset (new system_package_manager_debian ( move (os), host, arch, - progress, install, fetch, yes, sudo)); + progress, fetch_timeout, install, fetch, yes, sudo)); } else if (is_or_like (os, "fedora") || is_or_like (os, "rhel") || @@ -100,7 +104,7 @@ namespace bpkg r.reset (new system_package_manager_fedora ( move (os), host, arch, - progress, install, fetch, yes, sudo)); + progress, fetch_timeout, install, fetch, yes, sudo)); } // NOTE: remember to update the --sys-distribution pkg-build option // documentation if adding support for another package manager. |