From: blundellc <blundellc@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Date: Sat, 13 Sep 2008 13:26:58 +0000 (+0000)
Subject: remaining archive transistion
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ecc5cd2135e3701582eaa88685abfc862af4c529;p=cran2deb.git

remaining archive transistion

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

diff --git a/pkg/trunk/exec/update b/pkg/trunk/exec/update
index 3183356..0208723 100755
--- a/pkg/trunk/exec/update
+++ b/pkg/trunk/exec/update
@@ -13,10 +13,6 @@ for (x in `{find /etc/cran2deb -type f -name '*.in'}) {
     sed -e 's:@ROOT@:'^$root^':g' <$x >$y
 }
 mkdir -p /var/cache/cran2deb/results || exit 1
-if ([ ! -e $root/var/archive ]) {
-    # I symbolically link this into /var/www/
-    mkdir $root/var/archive || exit 1
-}
 mini-dinstall --batch -c /etc/cran2deb/mini-dinstall.conf || exit 1
 update_period=10800
 if (~ $1 full || ![ -e /var/cache/cran2deb/cache.rda ] ) {
diff --git a/pkg/trunk/inst/etc/dput.cf.in b/pkg/trunk/inst/etc/dput.cf.in
index 4ce816f..8ae0ca6 100644
--- a/pkg/trunk/inst/etc/dput.cf.in
+++ b/pkg/trunk/inst/etc/dput.cf.in
@@ -1,6 +1,6 @@
 [local]
 method = local
-incoming = @ROOT@/var/archive/mini-dinstall/incoming
+incoming = /etc/cran2deb/archive/mini-dinstall/incoming
 allow_non-us_software = 1
 run_dinstall = 0
 run_lintian = 1
diff --git a/pkg/trunk/inst/etc/mini-dinstall.conf.in b/pkg/trunk/inst/etc/mini-dinstall.conf.in
index 5de76d6..56cd938 100644
--- a/pkg/trunk/inst/etc/mini-dinstall.conf.in
+++ b/pkg/trunk/inst/etc/mini-dinstall.conf.in
@@ -5,8 +5,8 @@ verify_sigs = 0
 mail_on_success = 0
 archive_style = simple-subdir
 mail_log_level = NONE
-archivedir = @ROOT@/var/archive
-logfile = @ROOT@/var/mini-dinstall.log
+archivedir = /etc/cran2deb/archive
+logfile = @ROOT@/mini-dinstall.log
 
 [unstable]