also treat doMPI as Rmpi and npRmpi and add --no-test-load

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

diff --git a/TODO b/TODO
index 165c7ac8e9a9a285e0bf2c8bf6dc2670fa2c34dd..53cd457af9fba835935ebe5dba91285d48003b1e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -12,6 +12,6 @@ sooner
 later:
  - split up dependency structure to support building under different distributions
  - force'ing to a non-existent alias should fail.
- - (rev315) the Rmpi and npRmpi packages fail at the end of R CMD INSTALL because the test load of the package fails (outside of an MPI context)
+ - (rev315) the Rmpi, npRmpi and doMPI packages fail at the end of R CMD INSTALL because the test load of the package fails (outside of an MPI context)
    so added a crude hack that when the debian/rules is written, 'extraInstallArgs="--no-test-load"' is added (as I do for Debian's Rmpi package)
    conceivably we may want to generalise this one day as we do for lintian tests and patches and either look at at directory or a db table

diff --git a/trunk/R/debianpkg.R b/trunk/R/debianpkg.R
index 8e3f8d8279839a7c463ee19a42d7341b30ce3ac1..b9f7d2c92bd42235fdb0a4286be7025b02e1f780 100644 (file)
--- a/trunk/R/debianpkg.R
+++ b/trunk/R/debianpkg.R
@@ -37,7 +37,7 @@ generate_rules <- function(pkg) {
              ,'include /usr/share/R/debian/r-cran.mk'
              ,'',sep='\n')
        ,file=pkg$debfile('rules'))
-    if (pkg$name %in% c("Rmpi", "npRmpi")) {
+    if (pkg$name %in% c("Rmpi", "npRmpi", "doMPI")) {
         cat("extraInstallFlags=\"--no-test-load\"\n", file=pkg$debfile('rules'), append=TRUE)
     }      
     Sys.chmod(pkg$debfile('rules'),'0700')