update_cache: remove duplicate packages from available.

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

diff --git a/pkg/trunk/exec/update_cache b/pkg/trunk/exec/update_cache
index 7c13b969fdf4ec347885c561a7a445b8c6279b83..9fc98a285890e1d02081c128f320a683ea1b4d61 100755 (executable)
--- a/pkg/trunk/exec/update_cache
+++ b/pkg/trunk/exec/update_cache
@@ -11,15 +11,10 @@ mirror <- 'http://cran.r-project.org/'
 message('updating list of available R packages...')
 available <- available.packages(contrib.url(mirror))
 
-available_more <- available.packages(contrib.url('http://www.bioconductor.org/'))
-matches <- match(rownames(available_more),rownames(available))
-matches <- matches[!is.na(matches)]
-if (length(matches) > 0) {
-    message(paste(length(matches),'packages shared between repositories -- siding with CRAN'))
-    available <- rbind(available, available_more[-matches,])
-} else {
-    available <- rbind(available, available_more)
-}
+available <- rbind(available,available.packages(contrib.url('http://www.bioconductor.org/')))
+# prefer CRAN
+dupes <- duplicated(rownames(available), fromLast=T)
+available <- available[!dupes,]
 
 message('updating list of available R task views...')
 ctv.available <- available.views(repo=mirror)