From 4d052ebb44e0379e01c85e3a17bc9ceeabe40ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Tue, 30 Mar 2021 19:15:20 +0100 Subject: [PATCH] Fix R package finding. --- ognibuild/resolver/apt.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ognibuild/resolver/apt.py b/ognibuild/resolver/apt.py index c290273..ed67b89 100644 --- a/ognibuild/resolver/apt.py +++ b/ognibuild/resolver/apt.py @@ -394,9 +394,9 @@ def resolve_php_package_req(apt_mgr, req): def resolve_r_package_req(apt_mgr, req): paths = [ - posixpath.join("/usr/lib/R/site-library/.*/R/%s$" % re.escape(req.package)) + posixpath.join("/usr/lib/R/site-library", req.package) ] - return find_reqs_simple(apt_mgr, paths, regex=True, minimum_version=req.minimum_version) + return find_reqs_simple(apt_mgr, paths, minimum_version=req.minimum_version) def resolve_node_module_req(apt_mgr, req):