[R-gregmisc-users] SF.net SVN: r-gregmisc:[1773] trunk/gtools/R/clean_up_dependencies2.R
Brought to you by:
warnes
From: <wa...@us...> - 2014-02-11 17:44:06
|
Revision: 1773 http://sourceforge.net/p/r-gregmisc/code/1773 Author: warnes Date: 2014-02-11 17:44:04 +0000 (Tue, 11 Feb 2014) Log Message: ----------- Create and use locate copy of tools:::.split_op_version. Modified Paths: -------------- trunk/gtools/R/clean_up_dependencies2.R Modified: trunk/gtools/R/clean_up_dependencies2.R =================================================================== --- trunk/gtools/R/clean_up_dependencies2.R 2014-02-11 17:25:33 UTC (rev 1772) +++ trunk/gtools/R/clean_up_dependencies2.R 2014-02-11 17:44:04 UTC (rev 1773) @@ -1,5 +1,21 @@ .clean_up_dependencies2 <- function (x, installed, available) { + + .split_op_version <- function (x) + { + pat <- "^([^\\([:space:]]+)[[:space:]]*\\(([^\\)]+)\\).*" + x1 <- sub(pat, "\\1", x) + x2 <- sub(pat, "\\2", x) + if (x2 != x1) { + pat <- "[[:space:]]*([[<>=!]+)[[:space:]]+(.*)" + version <- sub(pat, "\\2", x2) + if (!grepl("^r", version)) + version <- package_version(version) + list(name = x1, op = sub(pat, "\\1", x2), version = version) + } + else list(name = x1) + } + .split_dependencies <- function(x) { .split2 <- function(x) { x <- sub("[[:space:]]+$", "", x) @@ -8,7 +24,7 @@ x <- x[names(x) != "R"] x <- x[nzchar(x)] x <- x[!duplicated(names(x))] - lapply(x, tools:::.split_op_version) + lapply(x, .split_op_version) } if (!any(nzchar(x))) return(list()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |