From: blundellc <blundellc@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Date: Sun, 1 Feb 2009 11:30:07 +0000 (+0000)
Subject: do not destroy archive between builds: accumulate. for this reason, no reason for... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ea2fbe2d02ce60814c8986b91530dd190d471fe9;p=cran2deb.git

do not destroy archive between builds: accumulate. for this reason, no reason for manually bringing in dependent R packages. should just work. (untested)

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

diff --git a/trunk/R/build.R b/trunk/R/build.R
index 4ca1923..f2e8100 100644
--- a/trunk/R/build.R
+++ b/trunk/R/build.R
@@ -24,13 +24,6 @@ build <- function(name,extra_deps,force=F) {
         if (pkg$debversion != version) {
             fail('expected Debian version',version,'not equal to actual version',pkg$debversion)
         }
-        # delete the current archive (XXX: assumes mini-dinstall)
-        for (subdir in c('mini-dinstall','unstable')) {
-            path = file.path(dinstall_archive,subdir)
-            if (file.exists(path)) {
-                unlink(path,recursive=T)
-            }
-        }
 
         # delete notes of upload
         file.remove(Sys.glob(file.path(pbuilder_results,'*.upload')))
@@ -41,23 +34,7 @@ build <- function(name,extra_deps,force=F) {
             fail('failed to create archive')
         }
 
-        # pull in all the R dependencies
         notice('R dependencies:',paste(pkg$depends$r,collapse=', '))
-        for (dep in pkg$depends$r) {
-            if (pkgname_as_debian(dep) %in% debian_pkgs) {
-                notice('using Debian package of',dep)
-                next
-            }
-            # otherwise, convert to source package name
-            srcdep = pkgname_as_debian(dep,binary=F)
-
-            notice('uploading',srcdep)
-            ret = log_system('umask 002;dput','-c',shQuote(dput_config),'local'
-                        ,changesfile(srcdep))
-            if (ret != 0) {
-                fail('upload of dependency failed! maybe you did not build it first?')
-            }
-        }
         build_debian(pkg)
 
         # upload the package
@@ -67,15 +44,6 @@ build <- function(name,extra_deps,force=F) {
             fail('upload failed!')
         }
 
-        # delete the current archive (XXX: assumes mini-dinstall)
-        # this is handy for group operation
-        for (subdir in c('mini-dinstall','unstable')) {
-            path = file.path(dinstall_archive,subdir)
-            if (file.exists(path)) {
-                unlink(path,recursive=T)
-            }
-        }
-
         return(pkg$debversion)
     })())
     cleanup(dir)