From e9d1abd2e82f3a11e862ba1c82e63d7d486e8d20 Mon Sep 17 00:00:00 2001
From: edd <edd@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Date: Sat, 29 May 2010 11:23:15 +0000
Subject: [PATCH] switch to reprepro instead of dput + mini-dinstall -- this
 works for i386 but we need to rearchitect things for amd64

git-svn-id: svn://svn.r-forge.r-project.org/svnroot/cran2deb@303 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
---
 trunk/R/build.R | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/trunk/R/build.R b/trunk/R/build.R
index 540610f..bddc8e3 100644
--- a/trunk/R/build.R
+++ b/trunk/R/build.R
@@ -36,26 +36,25 @@ build <- function(name,extra_deps,force=F,do_cleanup=T) {
         build_debian(pkg)
 
         # upload the package
-        ret = log_system('umask 002;dput','-c',shQuote(dput_config),'local'
-                    ,changesfile(pkg$srcname,pkg$debversion))
+##         ret = log_system('umask 002;dput','-c',shQuote(dput_config),'local' ,changesfile(pkg$srcname,pkg$debversion))
+        ret = log_system('umask 002; cd /var/www/rep; reprepro -b . include testing', changesfile(pkg$srcname,pkg$debversion))
         if (ret != 0) {
             fail('upload failed!')
         }
-
-        # wait for mini-dinstall to get to work
-        upload_success = FALSE
-        for (i in seq(1,12)) {
-            if (file.exists(file.path(dinstall_archive,'testing',paste(pkg$srcname, '_', pkg$version, '.orig.tar.gz', sep='')))) {
-                upload_success = TRUE
-                break
-            }
-            warn(i,'/12: does not exist',file.path(dinstall_archive,'testing',paste(pkg$srcname, '_', pkg$version, '.orig.tar.gz', sep='')))
-
-            Sys.sleep(5)
-        }
-        if (!upload_success) {
-            warn('upload took too long; continuing as normal (some builds may fail temporarily)')
-        }
+##         # wait for mini-dinstall to get to work
+##         upload_success = FALSE
+##         for (i in seq(1,12)) {
+##             if (file.exists(file.path(dinstall_archive,'testing',paste(pkg$srcname, '_', pkg$version, '.orig.tar.gz', sep='')))) {
+##                 upload_success = TRUE
+##                 break
+##             }
+##             warn(i,'/12: does not exist',file.path(dinstall_archive,'testing',paste(pkg$srcname, '_', pkg$version, '.orig.tar.gz', sep='')))
+
+##             Sys.sleep(5)
+##         }
+##         if (!upload_success) {
+##             warn('upload took too long; continuing as normal (some builds may fail temporarily)')
+##         }
         return(pkg$debversion)
     })())
     if (do_cleanup) {
-- 
2.39.2