From cf3613662443d8ebb2d5127143fc5de894e8abb6 Mon Sep 17 00:00:00 2001
From: blundellc <blundellc@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Date: Sat, 13 Sep 2008 13:23:49 +0000
Subject: [PATCH] misc: never try to build base packages. revert from using tee
 for log_system -- it clobbers the exit status.

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@102 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
---
 pkg/trunk/R/build.R | 4 ++++
 pkg/trunk/R/log.R   | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkg/trunk/R/build.R b/pkg/trunk/R/build.R
index 5201ea7..84d80ef 100644
--- 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 f8762ed..d9dce0a 100644
--- 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)
-- 
2.39.2