use NULL instead of NA. include git revision and date stamp in build log. generate...

[cran2deb.git] / pkg / trunk / R / build.R

diff --git a/pkg/trunk/R/build.R b/pkg/trunk/R/build.R
index 320e9535acf34e72bc9de1c6a6181af73c5a54ad..6f206a2cb856b43355b89fba5337b37017873f11 100644 (file)
--- a/pkg/trunk/R/build.R
+++ b/pkg/trunk/R/build.R
@@ -9,12 +9,12 @@ build <- function(name,extra_deps,force=F) {
     version <- try(new_build_version(name))
     if (inherits(version,'try-error')) {
         error('failed to build',name)
-        return(NA)
+        return(NULL)
     }
     result <- try((function() {
         if (!force && !needs_build(name,version)) {
             notice('skipping build of',name)
-            return(NA)
+            return(NULL)
         }
 
         pkg <- prepare_new_debian(prepare_pkg(dir,name),extra_deps)
@@ -67,7 +67,7 @@ build <- function(name,extra_deps,force=F) {
         return(pkg$debversion)
     })())
     cleanup(dir)
-    if (is.na(result)) {
+    if (is.null(result)) {
         # nothing was done so escape asap.
         return(result)
     }
@@ -87,7 +87,8 @@ needs_build <- function(name,version) {
     if (!is.null(build) && build$success) {
         # then something must have changed for us to attempt this
         # build
-        if (db_latest_build_version(name) == version &&
+        if (build$r_version == version_upstream(version) &&
+            build$deb_epoch == version_epoch(version) &&
             build$db_version == db_get_version()) {
             return(F)
         }
@@ -123,6 +124,7 @@ build_debian <- function(pkg) {
     cmd = paste('pdebuild --configfile',shQuote(pbuilder_config))
     if (version_revision(pkg$debversion) > 2) {
         cmd = paste(cmd,'--debbuildopts','-sd')
+        notice('build should exclude original source')
     }
     ret = log_system(cmd)
     setwd(wd)