Skip to content

Commit bedf8d4

Browse files
author
ripley
committed
need singular and plural messages
git-svn-id: https://svn.r-project.org/R/trunk@88982 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 21d2fd7 commit bedf8d4

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/library/tools/R/check.R

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3985,7 +3985,10 @@ add_dummies <- function(dir, Log)
39853985
strsplit(rempat, "\\|")[[1]])
39863986
epq <- paste(sQuote(ep), collapse = ", ")
39873987
out <- paste(c(out,
3988-
"These entry points may be removed soon:",
3988+
if(length(epq) > 1L)
3989+
"These entry points may be removed soon:"
3990+
else
3991+
"This entry point may be removed soon:",
39893992
epq),
39903993
collapse = "\n")
39913994
}
@@ -6180,7 +6183,7 @@ add_dummies <- function(dir, Log)
61806183
c(warn_re,
61816184
": (warning|note): .*Using fallback compilation with Armadillo 14[.]6[.]3")
61826185
## </FIXME>
6183-
6186+
61846187
warn_re <- paste0("(", paste(warn_re, collapse = "|"), ")")
61856188

61866189
lines <- grep(warn_re, lines, value = TRUE, useBytes = TRUE)

0 commit comments

Comments
 (0)