misc fixes: update database fully rather than just licenses, initialise a variable...

slightly worrying how the 5 changed to a 1.

R's error reporting is pretty foul. this missing extra_deps error
manifested itself 3-4 layers down the stack trace. R doesn't give a
stack trace either. not good for large software.

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

diff --git a/pkg/trunk/R/build.R b/pkg/trunk/R/build.R
index 151d47a2c6308d5717e5f261200bc90109d01e11..778410b9fb1d757913fbcb73facc0cbc2f6590f6 100644 (file)
--- a/pkg/trunk/R/build.R
+++ b/pkg/trunk/R/build.R
@@ -87,7 +87,12 @@ build_debian <- function(pkg) {
                  ,pkg$debname
                  ,paste('(',pkg$debversion,')',sep='')
                  ,'...')
-    ret = system(paste('pdebuild --configfile',shQuote(pbuilder_config)))
+
+    cmd = paste('pdebuild --configfile',shQuote(pbuilder_config))
+    if (version_revision(pkg$debversion) > 2) {
+        cmd = paste(cmd,'--debbuildopts','-sd')
+    }
+    ret = system(cmd)
     setwd(wd)
     if (ret != 0) {
         fail('Failed to build package.')

diff --git a/pkg/trunk/R/db.R b/pkg/trunk/R/db.R
index 5b5ab3be6dc0a7ddaacd4ece418aac0c9bb8ffaa..c73f98e3fbefe4d928f95cc8f45c8effc2f1b8f6 100644 (file)
--- a/pkg/trunk/R/db.R
+++ b/pkg/trunk/R/db.R
@@ -74,7 +74,7 @@ db_stop <- function(con,bump=F) {
 }
 
 db_quote <- function(text) {
-    return(paste('"',gsub('([^][[:alnum:][:space:]*?.,()<>;:/=+%-])','\\\\\\5',text),'"',sep=''))
+    return(paste('"',gsub('([^][[:alnum:][:space:]*?.,()<>;:/=+%-])','\\\\\\1',text),'"',sep=''))
 }
 
 db_now <- function() {

diff --git a/pkg/trunk/exec/autobuild b/pkg/trunk/exec/autobuild
index 1e1a65d47e4187ecaf5fa52e5ae9d9f55d038688..2e4107a43eee462f5ae61e7d0fc68444b0456ff4 100755 (executable)
--- a/pkg/trunk/exec/autobuild
+++ b/pkg/trunk/exec/autobuild
@@ -7,6 +7,6 @@ if (exists('argv')) { # check for littler
     build_order <- r_dependency_closure(outdated)
     notice('build order',paste(build_order,collapse=', '))
     for (pkg in build_order) {
-        build(pkg,extra_deps)
+        build(pkg,c())
     }
 }

diff --git a/pkg/trunk/exec/update b/pkg/trunk/exec/update
index 00e3a1b11d71d3f1b6aaa222deb54410d20963fd..d4548370dfcc9b24560417cddc4c08fab3354e9d 100755 (executable)
--- a/pkg/trunk/exec/update
+++ b/pkg/trunk/exec/update
@@ -28,8 +28,6 @@ if (![ -e /var/cache/cran2deb/cache.rda ] || [ $delta -gt $update_period ]) {
 }
 if (![ -e /var/cache/cran2deb/cran2deb.db ] || [ $delta -gt $update_period ]) {
     cat $root/data/^(populate_licenses quit) | $root/exec/license $root
-}
-if (![ -e /var/cache/cran2deb/cran2deb.db ]) {
     cat $root/data/^(populate_depend_aliases populate_sysreq populate_forcedep quit) | $root/exec/depend $root
 }