update_cache reverted to prior version (which calls get_base_pkgs)

get_base_pkgs now restricted to base package leaving Recommended packages for us to build

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

diff --git a/trunk/exec/get_base_pkgs b/trunk/exec/get_base_pkgs
index d08d62546b73186e9111667a0f595f3143c2e80f..9ec4d29acb3389f3a9fec0e67ca7d73c31de5cb9 100755 (executable)
--- a/trunk/exec/get_base_pkgs
+++ b/trunk/exec/get_base_pkgs
@@ -1,4 +1,6 @@
 #!/usr/bin/env r
+instPkgs <- installed.packages(lib.loc="/usr/lib/R/library")
+instPkgs <- instPkgs[ instPkgs[,"Priority"] == 'base', ]
 for (pkg in rownames(installed.packages())) {
        message(pkg)
 }

diff --git a/trunk/exec/update_cache b/trunk/exec/update_cache
index 6f82b49bdd4e8b9d3a01771681745d787132c5a1..e6741a940d8eb660450b0afe577d7e5b5d93f0f2 100755 (executable)
--- a/trunk/exec/update_cache
+++ b/trunk/exec/update_cache
@@ -19,12 +19,11 @@ available <- available.packages(contrib.url(mirror))
 message('updating list of available R task views...')
 ctv.available <- available.views(repo=mirror)
 
-#message('updating list of base R packages...')
-#base_pkgs <- readLines(pipe(paste('sudo pbuilder --execute --override-config --configfile'
-#                                 ,shQuote(pbuilder_config),'-- /usr/bin/R --vanilla 2>&1 >/dev/null <'
-#                                 ,shQuote(file.path(root,'exec/get_base_pkgs'))
-#                                 ,'| grep -v ^W:')))
-base_pkgs <- ''
+message('updating list of base R packages...')
+base_pkgs <- readLines(pipe(paste('sudo pbuilder --execute --override-config --configfile'
+                                 ,shQuote(pbuilder_config),'-- /usr/bin/R --vanilla 2>&1 >/dev/null <'
+                                 ,shQuote(file.path(root,'exec/get_base_pkgs'))
+                                 ,'| grep -v ^W:')))
 
 message('updating list of existing Debian packages...')
 debian_pkgs <- readLines(pipe('apt-cache rdepends r-base-core | sed -e "/^  r-cran/{s/^[[:space:]]*r/r/;p}" -e d | sort -u'))