add blacklist. build packages already in debian.

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

diff --git a/trunk/R/build.R b/trunk/R/build.R
index e6b5a13d684ed6144da462d9cefd7dca817c0637..157c888738ffb2ada70c6de4a2f54505c74d3456 100644 (file)
--- a/trunk/R/build.R
+++ b/trunk/R/build.R
@@ -20,6 +20,10 @@ build <- function(name,extra_deps,force=F) {
             return(NULL)
         }
 
+        if (name %in% db_blacklist_packages()) {
+            fail('package',name,'is blacklisted. consult database for reason.')
+        }
+
         pkg <- prepare_new_debian(prepare_pkg(dir,name),extra_deps)
         if (pkg$debversion != version) {
             fail('expected Debian version',version,'not equal to actual version',pkg$debversion)
@@ -69,6 +73,7 @@ needs_build <- function(name,version) {
         }
     } else {
         # always rebuild on failure or no record
+        notice('rebuilding',name,': no build record or previous build failed')
         return(T)
     }
     # see if it has already been built
@@ -79,12 +84,15 @@ needs_build <- function(name,version) {
         return(F)
     }
 
-    # XXX: what about building newer versions of Debian packages?
-    if (debname %in% debian_pkgs) {
-        notice(srcname,' exists in Debian (perhaps a different version)')
-        return(F)
+    if (build$r_version != version_upstream(version)) {
+        notice('rebuilding',name,': new upstream version',build$r_version,'(old) vs',version_upstream(version),'(new)')
+    }
+    if (build$deb_epoch != version_epoch(version)) {
+        notice('rebuilding',name,': new cran2deb epoch',build$deb_epoch,'(old) vs',version_epoch(version),'(new)')
+    }
+    if (build$db_version != db_get_version()) {
+        notice('rebuilding',name,': new db version',build$db_version,'(old) vs',db_get_version(),'(new)')
     }
-
     rm(debname,srcname)
     return(T)
 }