Skip to content

Commit 1477d50

Browse files
author
hornik
committed
Tweaks. By Michael Chirico.
git-svn-id: https://svn.r-project.org/R/trunk@88262 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent b45efed commit 1477d50

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/library/tools/R/utils.R

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2735,6 +2735,8 @@ R <-
27352735
function(fun, args = list(), opts = "--no-save --no-restore",
27362736
env = character(), arch = "", drop = TRUE, timeout = 0)
27372737
{
2738+
stopifnot(is.list(args))
2739+
27382740
.safe_repositories <- function() {
27392741
x <- getOption("repos")
27402742
y <- .get_standard_repository_URLs()
@@ -2775,7 +2777,9 @@ function(fun, args = list(), opts = "--no-save --no-restore",
27752777
val <- readRDS(tfo)
27762778
if (inherits(val, "condition")) {
27772779
## maybe wrap in a classed error and include some of res
2778-
msg <- paste0("error in inferior call:\n ", conditionMessage(val))
2780+
msg <- gettextf("error in inferior call:\n %s",
2781+
conditionMessage(val),
2782+
domain = NA)
27792783
stop(do.call(errorCondition,
27802784
c(list(message = msg,
27812785
class = "inferiorCallError",
@@ -2794,7 +2798,8 @@ function(fun, args = list(), opts = "--no-save --no-restore",
27942798
## again maybe wrap in a classed error and include some of res
27952799
## might want to distinguish two errors by sub-classes
27962800
stop(do.call(errorCondition,
2797-
c(list(message = "inferior call failed",
2801+
c(list(message = gettext("inferior call failed",
2802+
domain = NA),
27982803
class = "inferiorCallError"),
27992804
res = res)))
28002805
}

0 commit comments

Comments
 (0)