X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2FR%2Fgetrpkg.R;h=9c87c379460d28ecbc990241cb3fd287cadbd9e9;hb=d8a2e28b2f013a8624cb587f09f90120f46f1ce8;hp=b5e990f0bcc856275672fb44e41bff53b8b4456a;hpb=86e55bf48a319cf529b4a3519a11c0d94d47414b;p=cran2deb.git

diff --git a/trunk/R/getrpkg.R b/trunk/R/getrpkg.R
index b5e990f..9c87c37 100644
--- a/trunk/R/getrpkg.R
+++ b/trunk/R/getrpkg.R
@@ -117,19 +117,9 @@ repack_pkg <- function(pkg) {
 
 prepare_pkg <- function(dir, pkgname) {
     # download and extract an R package named pkgname
-    # OR the bundle containing pkgname
 
     # based loosely on library/utils/R/packages2.R::install.packages
 
-    # first a little trick; change pkgname if pkgname is contained in a bundle
-    if (!(pkgname %in% rownames(available))) {
-        bundle <- r_bundle_of(pkgname)
-        if (is.null(bundle)) {
-            fail('package',pkgname,'is unavailable')
-        }
-        pkgname <- bundle
-    }
-
     # grab the archive and some metadata
     pkg <- download_pkg(dir, pkgname)
 
@@ -167,10 +157,8 @@ prepare_pkg <- function(dir, pkgname) {
         }
     }
 
-    pkg$is_bundle = 'Bundle' %in% names(pkg$description[1,])
     # note subtly of short circuit operators (no absorption)
-    if ((!pkg$is_bundle && pkg$description[1,'Package'] != pkg$name) ||
-        ( pkg$is_bundle && pkg$description[1,'Bundle'] != pkg$name)) {
+    if (pkg$description[1,'Package'] != pkg$name) {
         fail('package name mismatch')
     }
     return(pkg)