From commits-return-4607-apmail-bigtop-commits-archive=bigtop.apache.org@bigtop.apache.org Fri Nov 13 03:12:09 2020 Return-Path: X-Original-To: apmail-bigtop-commits-archive@www.apache.org Delivered-To: apmail-bigtop-commits-archive@www.apache.org Received: from mxout1-ec2-va.apache.org (mxout1-ec2-va.apache.org [3.227.148.255]) by minotaur.apache.org (Postfix) with ESMTP id 96F4E19678 for ; Fri, 13 Nov 2020 03:12:07 +0000 (UTC) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-ec2-va.apache.org (ASF Mail Server at mxout1-ec2-va.apache.org) with SMTP id 170B949476 for ; Fri, 13 Nov 2020 03:12:07 +0000 (UTC) Received: (qmail 63126 invoked by uid 500); 13 Nov 2020 03:12:07 -0000 Delivered-To: apmail-bigtop-commits-archive@bigtop.apache.org Received: (qmail 63096 invoked by uid 500); 13 Nov 2020 03:12:06 -0000 Mailing-List: contact commits-help@bigtop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bigtop-dev@bigtop.apache.org Delivered-To: mailing list commits@bigtop.apache.org Received: (qmail 63085 invoked by uid 99); 13 Nov 2020 03:12:06 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Nov 2020 03:12:06 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 8E04F8E7BE; Fri, 13 Nov 2020 03:12:05 +0000 (UTC) Date: Fri, 13 Nov 2020 03:12:05 +0000 To: "commits@bigtop.apache.org" Subject: [bigtop] branch master updated: BIGTOP-3446. Fix toolchain task failure due to undefined variable in renv.pp. (#698) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <160523712529.12124.10788099113763466153@gitbox.apache.org> From: guyuqi@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: bigtop X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: b4784868fa9dc26f42d0e60271586e448486b754 X-Git-Newrev: 26614ccbb10fce25f17a71f152ebb2a00590642d X-Git-Rev: 26614ccbb10fce25f17a71f152ebb2a00590642d X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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