adapt for pbuilder base.tgz moving to system specific naming

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

diff --git a/branch/multisys/R/zzz.R b/branch/multisys/R/zzz.R
index 58bf250a482d26578e51a2d158d618d9137ce24c..54f1b214782088e969681a36feb4feb93dabd030 100644 (file)
--- a/branch/multisys/R/zzz.R
+++ b/branch/multisys/R/zzz.R
@@ -1,6 +1,6 @@
 .First.lib <- function(libname, pkgname) {
     global <- function(name,value) assign(name,value,envir=.GlobalEnv)
-    which_sys <- Sys.getenv('CRAN2DEB_SYS','debian-amd64')
+    global("which_sys", Sys.getenv('CRAN2DEB_SYS','debian-amd64'))
     if (!length(grep('^[a-z]+-[a-z0-9]+$',which_sys))) {
         stop('Invalid system specification: must be of the form name-arch')
     }

diff --git a/branch/multisys/exec/autobuild b/branch/multisys/exec/autobuild
index 0b24cba32edaff51fbce22e25f9d965e189193ba..f9dbaf9903e79a47861cc356ae8c9d1c8123d6a5 100755 (executable)
--- a/branch/multisys/exec/autobuild
+++ b/branch/multisys/exec/autobuild
@@ -2,7 +2,7 @@
 ## DOC: cran2deb autobuild
 ## DOC:     automatically builds all out of date packages.
 ## DOC:
-suppressMessages(library(cran2deb))
+suppressPackageStartupMessages(library(cran2deb))
 
 if (exists('argv')) { # check for littler
     db_update_package_versions()

diff --git a/branch/multisys/exec/build b/branch/multisys/exec/build
index b875e60097c3a7174c11aa3cc0abc4fdbd236e93..fbb906dbc3d107195535450f06504f3efa287cbe 100755 (executable)
--- a/branch/multisys/exec/build
+++ b/branch/multisys/exec/build
@@ -2,7 +2,7 @@
 ## DOC: cran2deb build [-D extra_dep1,extra_dep2,...] package1 package2 ...
 ## DOC:     builds a particular package.
 ## DOC:
-suppressMessages(library(cran2deb))
+suppressPackageStartupMessages(library(cran2deb))
 
 if (exists('argv')) { # check for littler
     argc <- length(argv)

diff --git a/branch/multisys/exec/latest_log b/branch/multisys/exec/latest_log
index 055991a627b6ce5af68b052d0474451268959b0a..e548134a54b45f137d3d7b9018f0d1a6f908a95f 100644 (file)
--- a/branch/multisys/exec/latest_log
+++ b/branch/multisys/exec/latest_log
@@ -1,7 +1,7 @@
 #!/usr/bin/env r
 ## DOC: cran2deb latest_log package1 package2 ...
 ## DOC:     show the latest log output for <package>
-suppressMessages(library(cran2deb))
+suppressPackageStartupMessages(library(cran2deb))
 
 if (exists('argv')) {
     for (pkg in argv) {

diff --git a/branch/multisys/exec/update b/branch/multisys/exec/update
index 7bcc78f0ecf4bab77fca4f6a87bf6d50570a6af4..80565ba1a944dcdb7692063a247160069c54d6e6 100755 (executable)
--- a/branch/multisys/exec/update
+++ b/branch/multisys/exec/update
@@ -20,7 +20,8 @@ if (~ $1 full || ![ -e /var/cache/cran2deb/cache.rda ] ) {
 }
 if (![ -e /var/cache/cran2deb/cache.rda ] || [ $delta -gt $update_period ]) {
     mode=create
-    if ([ -e /var/cache/pbuilder/base-cran2deb.tgz ]) {
+    sys=`{cran2deb which_sys}
+    if ([ -e /var/cache/pbuilder/base-cran2deb-$sys.tgz ]) {
         mode=update
     }
     sudo pbuilder $mode --override-config --configfile /etc/cran2deb/pbuilderrc

diff --git a/branch/multisys/exec/which_sys b/branch/multisys/exec/which_sys
new file mode 100755 (executable)
index 0000000..2426b9a
--- /dev/null
+++ b/branch/multisys/exec/which_sys
@@ -0,0 +1,7 @@
+#!/usr/bin/env r
+## DOC: cran2deb which_sys
+## DOC:     show which system cran2deb will build for next
+## DOC:
+suppressMessages(library(cran2deb))
+
+cat(which_sys)