misc: never try to build base packages. revert from using tee for log_system -- it...

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@102 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

diff --git a/pkg/trunk/R/build.R b/pkg/trunk/R/build.R
index 5201ea7b72cc898f17994c4e7f7734667b4574c4..84d80ef092ca243b0cd4e6cbb2b7f2c276c16b3b 100644 (file)
--- a/pkg/trunk/R/build.R
+++ b/pkg/trunk/R/build.R
@@ -1,5 +1,9 @@
 
 build <- function(name,extra_deps,force=F) {
+    # can't, and hence don't need to, build base packages
+    if (name %in% base_pkgs) {
+        return(T)
+    }
     log_clear()
     dir <- setup()
     version <- new_build_version(name)

diff --git a/pkg/trunk/R/log.R b/pkg/trunk/R/log.R
index f8762edc291b22e48ba6059ae13a82283343d790..d9dce0a95ca57fc6a41d3275c729489149f8f5da 100644 (file)
--- a/pkg/trunk/R/log.R
+++ b/pkg/trunk/R/log.R
@@ -41,7 +41,9 @@ log_system <- function(...) {
         tmp <- tempfile('log_system')
         on.exit(unlink(tmp))
         cmd <- paste(...)
-        cmd <- paste(cmd,'2>&1','| tee',tmp)
+        # unfortunately this destroys ret
+        #cmd <- paste(cmd,'2>&1','| tee',tmp)
+        cmd <- paste(cmd,'>',tmp,'2>&1')
         ret <- system(cmd)
         f <- file(tmp)
         output <- readLines(f)