update of packages
This commit is contained in:
@@ -235,9 +235,18 @@ if(.ess.Rversion < "1.8")
|
||||
invokeRestart("browser")
|
||||
}
|
||||
|
||||
out <- withCallingHandlers(
|
||||
interrupt = restart,
|
||||
withVisible(expr)
|
||||
## Should be an exiting handler to be able to catch
|
||||
## stack overflow errors
|
||||
rethrow <- function(cnd) {
|
||||
stop('ESSR::ERROR \"', conditionMessage(cnd), '\"')
|
||||
}
|
||||
|
||||
out <- tryCatch(
|
||||
error = rethrow,
|
||||
withCallingHandlers(
|
||||
interrupt = restart,
|
||||
withVisible(expr)
|
||||
)
|
||||
)
|
||||
|
||||
## Print result manually because we can't rely on auto-print
|
||||
|
||||
@@ -11,6 +11,9 @@
|
||||
## load .base.R and all other files into ESSR environment; then attach ESSR
|
||||
.ess.ESSR.load <- function(dir) {
|
||||
|
||||
if (nzchar(Sys.getenv("ESSR_TEST_LOAD_ERROR")))
|
||||
stop('Loading failed with a nice message.')
|
||||
|
||||
Rver <- .ess.ESSR.get.rver()
|
||||
ESSR <- .ess.ESSR.create.env(Rver)
|
||||
.ess.ESSR.source.files(ESSR, dir, Rver)
|
||||
|
||||
Reference in New Issue
Block a user