From: blundellc <blundellc@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Date: Sat, 13 Sep 2008 16:09:37 +0000 (+0000)
Subject: adapt for pbuilder base.tgz moving to system specific naming
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=938a94c3450df390e8f5f5be1369c9ffa41ec472;p=cran2deb.git

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 58bf250..54f1b21 100644
--- 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 0b24cba..f9dbaf9 100755
--- 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 b875e60..fbb906d 100755
--- 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 055991a..e548134 100644
--- 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 7bcc78f..80565ba 100755
--- 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
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)