This is an automated email from the ASF dual-hosted git repository.
guyuqi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new f4d65ae97 BIGTOP-4013. Fix toolchain to install R 3.6.0+ into Debian
10. (#1186)
f4d65ae97 is described below
commit f4d65ae97b484c8e01efa936948ed01574f149d2
Author: Kengo Seki <[email protected]>
AuthorDate: Wed Oct 18 13:27:30 2023 +0900
BIGTOP-4013. Fix toolchain to install R 3.6.0+ into Debian 10. (#1186)
---
bigtop_toolchain/manifests/renv.pp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bigtop_toolchain/manifests/renv.pp
b/bigtop_toolchain/manifests/renv.pp
index 429a942ec..1f43d7275 100644
--- a/bigtop_toolchain/manifests/renv.pp
+++ b/bigtop_toolchain/manifests/renv.pp
@@ -34,7 +34,7 @@ class bigtop_toolchain::renv {
}
/(Ubuntu|Debian)/: {
if (($operatingsystem == 'Ubuntu' and
versioncmp($operatingsystemmajrelease, '18.04') <= 0) or
- ($operatingsystem == 'Debian' and
versioncmp($operatingsystemmajrelease, '10') < 0)) {
+ ($operatingsystem == 'Debian' and
versioncmp($operatingsystemmajrelease, '10') <= 0)) {
$pkgs = [
"r-base-dev",
"libcairo2-dev",
@@ -85,7 +85,7 @@ class bigtop_toolchain::renv {
#
# Then Install required R packages dependency
if (($operatingsystem == 'Ubuntu' and versioncmp($operatingsystemmajrelease,
'18.04') <= 0) or
- ($operatingsystem == 'Debian' and versioncmp($operatingsystemmajrelease,
'10') < 0)) {
+ ($operatingsystem == 'Debian' and versioncmp($operatingsystemmajrelease,
'10') <= 0)) {
$url = "https://cran.r-project.org/src/base/R-3/"
$rfile = "R-3.6.3.tar.gz"
$rdir = "R-3.6.3"