build: make things a little more robust.

turns out c(1,'lala') -> makes 1 a string. use list() instead. also
catch the exception when build_new_version fails.

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

diff --git a/pkg/trunk/R/build.R b/pkg/trunk/R/build.R
index 84d80ef092ca243b0cd4e6cbb2b7f2c276c16b3b..320e9535acf34e72bc9de1c6a6181af73c5a54ad 100644 (file)
--- a/pkg/trunk/R/build.R
+++ b/pkg/trunk/R/build.R
@@ -6,7 +6,11 @@ build <- function(name,extra_deps,force=F) {
     }
     log_clear()
     dir <- setup()
-    version <- new_build_version(name)
+    version <- try(new_build_version(name))
+    if (inherits(version,'try-error')) {
+        error('failed to build',name)
+        return(NA)
+    }
     result <- try((function() {
         if (!force && !needs_build(name,version)) {
             notice('skipping build of',name)

diff --git a/pkg/trunk/R/db.R b/pkg/trunk/R/db.R
index 8c26c15c8fec31cb81b04a1f9927816108ce07a6..1ddcf8a49665364e1f3e72d9477a02db17c741e8 100644 (file)
--- a/pkg/trunk/R/db.R
+++ b/pkg/trunk/R/db.R
@@ -325,7 +325,7 @@ db_latest_build_status <- function(pkgname) {
     if (is.null(build)) {
         return(NULL)
     }
-    return(c(build$success,build$log))
+    return(list(build$success,build$log))
 }
 
 db_outdated_packages <- function() {