Skip to content

Commit 550750e

Browse files
committed
Revert auto-detection back so that it does not try to upgrade lintr
1 parent 2e89c2a commit 550750e

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

dev/lint-r.R

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,9 @@ if (! library(SparkR, lib.loc = LOCAL_LIB_LOC, logical.return = TRUE)) {
2424
stop("You should install SparkR in a local directory with `R/install-dev.sh`.")
2525
}
2626

27-
# Installs lintr from Github in a local directory if lintr is not installed already or
28-
# the existing lintr is not the specified version.
29-
#
30-
# Note that, the CRAN's version is too old to adapt to our rules. Therefore, we try to
31-
# install lintr from the latest commit in Github, rather than a specific tag or release.
32-
# The current latest is jimhester/lintr@5431140 (see SPARK-22063), the dev version,
33-
# '1.0.1.9000'.
34-
if ("lintr" %in% row.names(installed.packages()) == FALSE ||
35-
packageVersion("lintr") != "1.0.1.9000") {
27+
# Installs lintr from Github in a local directory.
28+
# NOTE: The CRAN's version is too old to adapt to our rules.
29+
if ("lintr" %in% row.names(installed.packages()) == FALSE) {
3630
devtools::install_github("jimhester/lintr@5431140")
3731
}
3832

0 commit comments

Comments
 (0)