Tweaks for c87633.

git-svn-id: https://svn.r-project.org/R/trunk@87635 00db46b3-68df-0310-9c12-caf00c1e9a41
r-devel · Jan 26, 2025 · 4cf55e6 · 4cf55e6
1 parent 348852b
commit 4cf55e6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/library/tools/R/build.R b/src/library/tools/R/build.R
@@ -1203,12 +1203,14 @@ inRbuildignore <- function(files, pkgdir) {
                 msg <- paste("WARNING: Added dependency on R >= 4.3.0 because",
                              "package code uses the pipe placeholder at the head of a chain of extractions syntax added in R 4.3.0.")
                 files <- unique(tab$file[i])
-            } else if(length(i <- which(tab$needs == "4.2.0"))) {
+            } else if(!hasDep420 &&
+                      length(i <- which(tab$needs == "4.2.0"))) {
                 fixup_R_dep(pkgname, "4.2.0")
                 msg <- paste("WARNING: Added dependency on R >= 4.2.0 because",
                              "package code uses the pipe placeholder syntax added in R 4.2.0")
                 files <- unique(tab$file[i])
-            } else if(length(i <- which(tab$needs == "4.1.0"))) {
+            } else if(!hasDep410 &&
+                      length(i <- which(tab$needs == "4.1.0"))) {
                 fixup_R_dep(pkgname, "4.1.0")
                 msg <- paste("WARNING: Added dependency on R >= 4.1.0 because",
                              "package code uses the pipe |> or function shorthand \\(...) syntax added in R 4.1.0.")

diff --git a/src/library/tools/R/check.R b/src/library/tools/R/check.R
@@ -1268,12 +1268,16 @@ add_dummies <- function(dir, Log)
                 any <- TRUE
                 msg <- "Missing dependency on R >= 4.3.0 because package code uses the pipe placeholder at the head of a chain of extractions syntax added in R 4.3.0."
                 files <- unique(tab$file[i])
-            } else if(length(i <- which(tab$needs == "4.2.0"))) {
+            } else if(length(i <- which(tab$needs == "4.2.0")) &&
+                      !.package_metadata_has_depends_on_R_at_least(db,
+                                                                   "4.2.0")) {
                 if(!any) noteLog(Log)
                 any <- TRUE
                 msg <- "Missing dependency on R >= 4.2.0 because package code uses the pipe placeholder syntax added in R 4.2.0."
                 files <- unique(tab$file[i])
-            } else if(length(i <- which(tab$needs == "4.1.0"))) {
+            } else if(length(i <- which(tab$needs == "4.1.0")) &&
+                      !.package_metadata_has_depends_on_R_at_least(db,
+                                                                   "4.1.0")) {
                 if(!any) noteLog(Log)
                 any <- TRUE
                 msg <- "Missing dependency on R >= 4.1.0 because package code uses the pipe |> or function shorthand \\(...) syntax added in R 4.1.0."