]> git.donarmstrong.com Git - cran2deb.git/commitdiff
Syntax correction.
authormoeller <moeller@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Tue, 8 Feb 2011 15:50:04 +0000 (15:50 +0000)
committermoeller <moeller@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Tue, 8 Feb 2011 15:50:04 +0000 (15:50 +0000)
git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@340 edb9625f-4e0d-4859-8d74-9fd3b1da38cb

trunk/R/build.R
trunk/exec/build

index 967c68ae7a08ce52334a62e8957d24f35ffc752b..2d1b245a54db27e6fbe571216a5cdd335639c16c 100644 (file)
@@ -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) {
index 63eff3b9c1e16c5c9cf447199129d01fed019bf6..a2e17352f3ad1dd1392cc5fccb480cace2de731e 100755 (executable)
@@ -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<length(build_order),paste(build_order,collapse=', ',sep="")," nothing to be built"))
     for (pkg in build_order) {
         #cat("Invoking build of '",pkg,"'\n",sep="")
         build(pkg,extra_deps,force=pkg %in% argv, do_cleanup)