Skip to content

Commit fbea9da

Browse files
author
ripley
committed
allow .tar and .tar.zstd tarballs in R CMD check
git-svn-id: https://svn.r-project.org/R/trunk@88340 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 8e94010 commit fbea9da

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

doc/NEWS.Rd

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,14 @@
159159

160160
\section{\Rlogo CHANGES IN R 4.5.1 patched}{
161161

162+
\subsection{UTILITIES}{
163+
\itemize{
164+
\item \command{R CMD check} now handles archives with extension
165+
\file{.tar} and \file{.tar.zstd} (where \command{zstd} compression
166+
is supported by the \R build).
167+
}
168+
}
169+
162170
\subsection{BUG FIXES}{
163171
\itemize{
164172
\item .

src/library/tools/R/check.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6949,8 +6949,8 @@ add_dummies <- function(dir, Log)
69496949
cat("Usage: R CMD check [options] pkgs",
69506950
"",
69516951
"Check R packages from package sources, which can be directories or",
6952-
"package 'tar' archives with extension '.tar.gz', '.tar.bz2',",
6953-
"'.tar.xz' or '.tgz'.",
6952+
"package 'tar' archives with extension '.tar', .tar.gz', '.tar.bz2',",
6953+
"'.tar.xz', '.tar.zstd' or '.tgz'.",
69546954
"",
69556955
"A variety of diagnostic checks on directory structure, index and",
69566956
"control files are performed. The package is installed into the log",
@@ -7552,7 +7552,7 @@ add_dummies <- function(dir, Log)
75527552
} else if (file.exists(pkg)) {
75537553
is_tar <- TRUE
75547554
if (thispkg_subdirs == "default") thispkg_subdirs <- "yes-maybe"
7555-
pkgname0 <- sub("\\.(tar\\.gz|tgz|tar\\.bz2|tar\\.xz)$", "", pkgname0)
7555+
pkgname0 <- sub("\\.(tar|tar\\.gz|tgz|tar\\.bz2|tar\\.xz|tar\\.zstd)$", "", pkgname0)
75567556
pkgname0 <- sub("_[0-9.-]*$", "", pkgname0)
75577557
} else {
75587558
warning(sQuote(pkg), " is neither a file nor directory, skipping\n",

src/library/utils/man/PkgUtils.Rd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
\item{pkgdirs}{a list of names of directories with sources of \R
2020
add-on packages. For \code{check} these can also be the filenames of
2121
(possibly compressed) \command{tar} archives with extension
22-
\file{.tar}, \file{.tar.gz}, \file{.tgz}, \file{.tar.bz2} or
23-
\file{.tar.xz}.}
22+
\file{.tar}, \file{.tar.gz}, \file{.tgz}, \file{.tar.bz2},
23+
\file{.tar.xz} or \file{.tar.zstd}.}
2424
\item{options}{further options to control the processing, or for
2525
obtaining information about usage and version of the utility.}
2626
}

0 commit comments

Comments
 (0)