This is an automated email from the ASF dual-hosted git repository.
sekikn 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 8d473b8 BIGTOP-3540. Fix toolchain to abort if R installation failed.
(#776)
8d473b8 is described below
commit 8d473b87312e556d8ad42d964579c2447d7ef47b
Author: Kengo Seki <[email protected]>
AuthorDate: Tue Jun 22 14:43:01 2021 +0900
BIGTOP-3540. Fix toolchain to abort if R installation failed. (#776)
---
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 281f684..f4daed9 100644
--- a/bigtop_toolchain/manifests/renv.pp
+++ b/bigtop_toolchain/manifests/renv.pp
@@ -81,14 +81,14 @@ class bigtop_toolchain::renv {
exec { "install_r_packages" :
cwd => "/usr/local/bin",
- command => "/usr/local/bin/R -e \"install.packages(c('devtools',
'evaluate', 'rmarkdown', 'knitr', 'roxygen2', 'testthat', 'e1071'), repos =
'http://cran.r-project.org/')\"",
+ command => '/usr/local/bin/R -e \'pkgs <- c("devtools", "evaluate",
"rmarkdown", "knitr", "roxygen2", "testthat", "e1071"); install.packages(pkgs,
repo="http://cran.r-project.org/"); for (pkg in pkgs[pkgs != "devtools"]) if
(!library(pkg, character.only=TRUE, logical.return=TRUE)) q(save="no",
status=1)\'',
require => [Exec["install_R"]],
timeout => 6000
}
} else {
exec { "install_r_packages" :
cwd => "/usr/bin",
- command => "/usr/bin/R -e \"install.packages(c('devtools', 'evaluate',
'rmarkdown', 'knitr', 'roxygen2', 'testthat', 'e1071'), repos =
'http://cran.r-project.org/')\"",
+ command => '/usr/bin/R -e \'pkgs <- c("devtools", "evaluate",
"rmarkdown", "knitr", "roxygen2", "testthat", "e1071"); install.packages(pkgs,
repo="http://cran.r-project.org/"); for (pkg in pkgs[pkgs != "devtools"]) if
(!library(pkg, character.only=TRUE, logical.return=TRUE)) q(save="no",
status=1)\'',
timeout => 6000
}
}