From a19a59652f736deb43b6c150fb8e33eb3bb04aa2 Mon Sep 17 00:00:00 2001 From: Lorenz Date: Mon, 3 May 2021 18:08:22 +0200 Subject: [PATCH] Use more common package definition --- pre_commit/languages/r.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pre_commit/languages/r.py b/pre_commit/languages/r.py index 83e60009..64234c1d 100644 --- a/pre_commit/languages/r.py +++ b/pre_commit/languages/r.py @@ -107,11 +107,13 @@ def install_environment( 'renv::activate("', file.path(getwd()), '"); ' ) writeLines(activate_statement, 'activate.R') - is_package <- tryCatch({{ - content_desc <- read.dcf(file.path(prefix_dir, 'DESCRIPTION')) - suppressWarnings(unname(content_desc[,'Type']) == "Package") - }}, - error = function(...) FALSE + is_package <- tryCatch( + {{ + path_desc <- file.path(prefix_dir, 'DESCRIPTION') + suppressWarnings(desc <- read.dcf(path_desc)) + "Package" %in% colnames(desc) + }}, + error = function(...) FALSE ) if (is_package) {{ renv::install(prefix_dir)