build: always force the build of packages mentioned on the command line.

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

diff --git a/pkg/trunk/R/build.R b/pkg/trunk/R/build.R
index 6f206a2cb856b43355b89fba5337b37017873f11..316258b4d8c4d9b8ebfd563702499d260c948b52 100644 (file)
--- a/pkg/trunk/R/build.R
+++ b/pkg/trunk/R/build.R
@@ -6,11 +6,14 @@ build <- function(name,extra_deps,force=F) {
     }
     log_clear()
     dir <- setup()
+
+    # obtain the Debian version-to-be
     version <- try(new_build_version(name))
     if (inherits(version,'try-error')) {
         error('failed to build',name)
         return(NULL)
     }
+
     result <- try((function() {
         if (!force && !needs_build(name,version)) {
             notice('skipping build of',name)
@@ -71,6 +74,7 @@ build <- function(name,extra_deps,force=F) {
         # nothing was done so escape asap.
         return(result)
     }
+
     # otherwise record progress
     failed = inherits(result,'try-error')
     if (failed) {
@@ -103,6 +107,7 @@ needs_build <- function(name,version) {
         notice('already built',srcname,'version',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)')

diff --git a/pkg/trunk/exec/build b/pkg/trunk/exec/build
index aa8a175a66d71732379cd21d5fc5cd275a1205d3..b875e60097c3a7174c11aa3cc0abc4fdbd236e93 100755 (executable)
--- a/pkg/trunk/exec/build
+++ b/pkg/trunk/exec/build
@@ -38,6 +38,6 @@ if (exists('argv')) { # check for littler
     build_order <- r_dependency_closure(c(extra_deps$r,argv))
     notice('build order',paste(build_order,collapse=', '))
     for (pkg in build_order) {
-        build(pkg,extra_deps)
+        build(pkg,extra_deps,force=pkg %in% argv)
     }
 }