From 148b115be0dc549b792c66b4d9c2f3dd053fd284 Mon Sep 17 00:00:00 2001 From: moeller Date: Tue, 8 Feb 2011 15:50:04 +0000 Subject: [PATCH] Syntax correction. git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@340 edb9625f-4e0d-4859-8d74-9fd3b1da38cb --- trunk/R/build.R | 8 ++------ trunk/exec/build | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/trunk/R/build.R b/trunk/R/build.R index 967c68a..2d1b245 100644 --- a/trunk/R/build.R +++ b/trunk/R/build.R @@ -132,18 +132,14 @@ build_debian <- function(pkg) { #notice(paste("Now in path ",wd,"\n",sep="")) setwd(pkg$path) - notice('building Debian package' - ,pkg$debname - ,paste('(',pkg$debversion,')',sep='') - ,'in',getwd(), - ,'...') + notice('building Debian package',pkg$debname,paste('(',pkg$debversion,')',sep=''),'in',getwd(),'...') cmd = paste('pdebuild --configfile',shQuote(pbuilder_config)) if (version_revision(pkg$debversion) > 2) { cmd = paste(cmd,'--debbuildopts','-sd') notice('build should exclude original source') } - notice(paste("Executing '",cmd,"' from directory '",getwd(),"'.\n",sep="")) + notice(paste("Executing ",'"',cmd,'"'," from directory '",getwd(),"'.\n",sep="")) ret = log_system(cmd) setwd(wd) if (ret != 0) { diff --git a/trunk/exec/build b/trunk/exec/build index 63eff3b..a2e1735 100755 --- a/trunk/exec/build +++ b/trunk/exec/build @@ -41,7 +41,8 @@ if (exists('argv')) { # check for littler err('usage: cran2deb build [-d] [-D extra_dep1,extra_dep2,...] package package ...') } build_order <- r_dependency_closure(c(extra_deps$r,argv)) - notice('build order',paste(build_order,collapse=', ')) + #cat("build_order: "); print(build_order); + notice('build order',ifelse(0