bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From guy...@apache.org
Subject [bigtop] branch master updated: BIGTOP-3446. Fix toolchain task failure due to undefined variable in renv.pp. (#698)
Date Fri, 13 Nov 2020 03:12:05 GMT
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 26614cc  BIGTOP-3446. Fix toolchain task failure due to undefined variable in renv.pp.
(#698)
26614cc is described below

commit 26614ccbb10fce25f17a71f152ebb2a00590642d
Author: Masatake Iwasaki <iwasakims@apache.org>
AuthorDate: Fri Nov 13 12:11:57 2020 +0900

    BIGTOP-3446. Fix toolchain task failure due to undefined variable in renv.pp. (#698)
    
    Megerd, thanks @iwasakims
---
 bigtop_toolchain/manifests/renv.pp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/bigtop_toolchain/manifests/renv.pp b/bigtop_toolchain/manifests/renv.pp
index 16fc484..54bbde7 100644
--- a/bigtop_toolchain/manifests/renv.pp
+++ b/bigtop_toolchain/manifests/renv.pp
@@ -41,21 +41,19 @@ class bigtop_toolchain::renv {
           "pandoc",
           "pandoc-citeproc",
         ]
-        $rpkgs = "install_r_packages_ubt16.04"
       } else {
         $pkgs = [
           "r-base",
           "r-base-dev",
           "pandoc",
         ]
-        $rpkgs = "install_r_packages"
       }
     }
   }
 
   package { $pkgs:
     ensure => installed,
-    before => [Exec[$rpkgs]]
+    before => [Exec["install_r_packages"]]
   }
 
   # BIGTOP-3443:
@@ -80,14 +78,14 @@ class bigtop_toolchain::renv {
       timeout => 3000
     }
 
-    exec { $rpkgs :
+    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.us.r-project.org')\"",
       require => [Exec["install_R"]],
       timeout => 6000
     }
   } else {
-    exec { $rpkgs :
+    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.us.r-project.org')\"",
       timeout => 6000


Mime
View raw message