X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2FR%2Fdebianpkg.R;h=e3656d31e8ae284133600aef506fe2db0a9ac618;hb=d8a2e28b2f013a8624cb587f09f90120f46f1ce8;hp=63aaaddd7237786e9d8d31d2907d8bf71005ad01;hpb=86e55bf48a319cf529b4a3519a11c0d94d47414b;p=cran2deb.git diff --git a/trunk/R/debianpkg.R b/trunk/R/debianpkg.R index 63aaadd..e3656d3 100644 --- a/trunk/R/debianpkg.R +++ b/trunk/R/debianpkg.R @@ -109,18 +109,7 @@ prepare_new_debian <- function(pkg,extra_deps) { # says: ``The sources and headers for the compiled code are in src, plus # optionally file Makevars or Makefile.'' It seems unlikely that # architecture independent code would end up here. - if (pkg$is_bundle) { - # if it's a bundle, check each of the packages - pkg$archdep = F - for (pkgname in r_bundle_contains(pkg$name)) { - pkg$archdep = file.exists(file.path(pkg$path,pkgname,'src')) - if (pkg$archdep) { - break - } - } - } else { - pkg$archdep = file.exists(file.path(pkg$path,'src')) - } + pkg$archdep = file.exists(file.path(pkg$path,'src')) pkg$arch <- 'all' if (pkg$archdep) { pkg$arch <- host_arch()