summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJudd Vinet <judd@archlinux.org>2004-08-19 23:47:03 +0000
committerJudd Vinet <judd@archlinux.org>2004-08-19 23:47:03 +0000
commite11622c10fa4b75d264c78c668282f5b21e6f158 (patch)
treec54cba3a86085e44e7e014fb33984b3f0c80c3f1
parent5c8c26b650008d7af1305d5e304fb5a2c8f3e85c (diff)
added cleanup calls to db- scripts, removed export-failure checks from db-testing, as its allowed for tesitng
-rwxr-xr-xdb-arch4
-rwxr-xr-xdb-extra4
-rwxr-xr-xdb-testing15
-rwxr-xr-xdb-unstable4
4 files changed, 11 insertions, 16 deletions
diff --git a/db-arch b/db-arch
index 823de44..a3938c3 100755
--- a/db-arch
+++ b/db-arch
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Id: db-arch,v 1.19 2004/08/17 19:17:36 judd Exp $
+# $Id: db-arch,v 1.20 2004/08/19 23:47:03 judd Exp $
uid=`id -u`
repoid=1
@@ -40,11 +40,13 @@ cd $TMPDIR
CVS_RSH=ssh CVSROOT=:ext:cvs.archlinux.org:/home/cvs-arch cvs -q export -r CURRENT arch/build
if [ $? -gt 0 ]; then
echo "==> CVS export failed!"
+ cleanup
exit 1
fi
# check again
if [ -d /tmp/.gensync ]; then
echo "error: someone else is currently running gensync!"
+ cleanup
exit 1
fi
/usr/bin/gensync $TMPDIR/arch/build $TMPDIR/current.db.tar.gz /home/ftp/current/os/i686
diff --git a/db-extra b/db-extra
index 04f7307..1413b80 100755
--- a/db-extra
+++ b/db-extra
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Id: db-extra,v 1.7 2004/08/17 19:17:36 judd Exp $
+# $Id: db-extra,v 1.8 2004/08/19 23:47:03 judd Exp $
uid=`id -u`
repoid=2
@@ -40,11 +40,13 @@ cd $TMPDIR
CVS_RSH=ssh CVSROOT=:ext:cvs.archlinux.org:/home/cvs-extra cvs -q export -r CURRENT extra
if [ $? -gt 0 ]; then
echo "==> CVS export failed!"
+ cleanup
exit 1
fi
# check again
if [ -d /tmp/.gensync ]; then
echo "error: someone else is currently running gensync!"
+ cleanup
exit 1
fi
/usr/bin/gensync $TMPDIR/extra $TMPDIR/extra.db.tar.gz /home/ftp/extra/os/i686
diff --git a/db-testing b/db-testing
index 255ce13..a75ad97 100755
--- a/db-testing
+++ b/db-testing
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Id: db-testing,v 1.7 2004/08/17 19:17:36 judd Exp $
+# $Id: db-testing,v 1.8 2004/08/19 23:47:03 judd Exp $
uid=`id -u`
repoid=4
@@ -39,28 +39,17 @@ echo "==> Generating Pacman Database for TESTING..." >&2
cd $TMPDIR
echo "--- CURRENT ---"
CVS_RSH=ssh CVSROOT=:ext:cvs.archlinux.org:/home/cvs-arch cvs -q export -r TESTING arch
-if [ $? -gt 0 ]; then
- echo "==> CVS export failed!"
- exit 1
-fi
mv arch/build/* . && rm -rf arch
echo "--- EXTRA ---"
CVS_RSH=ssh CVSROOT=:ext:cvs.archlinux.org:/home/cvs-extra cvs -q export -r TESTING extra
-if [ $? -gt 0 ]; then
- echo "==> CVS export failed!"
- exit 1
-fi
cp -a extra/* . && rm -rf extra
echo "--- UNSTABLE ---"
CVS_RSH=ssh CVSROOT=:ext:cvs.archlinux.org:/home/cvs-unstable cvs -q export -r TESTING unstable
-if [ $? -gt 0 ]; then
- echo "==> CVS export failed!"
- exit 1
-fi
cp -a unstable/* . && rm -rf unstable
# check again
if [ -d /tmp/.gensync ]; then
echo "error: someone else is currently running gensync!"
+ cleanup
exit 1
fi
/usr/bin/gensync $TMPDIR $TMPDIR/testing.db.tar.gz /home/ftp/testing/os/i686
diff --git a/db-unstable b/db-unstable
index e562e58..9826222 100755
--- a/db-unstable
+++ b/db-unstable
@@ -1,5 +1,5 @@
#!/bin/bash
-# $Id: db-unstable,v 1.12 2004/08/17 19:17:36 judd Exp $
+# $Id: db-unstable,v 1.13 2004/08/19 23:47:03 judd Exp $
uid=`id -u`
repoid=3
@@ -40,11 +40,13 @@ cd $TMPDIR
CVS_RSH=ssh CVSROOT=:ext:cvs.archlinux.org:/home/cvs-unstable cvs -q export -r CURRENT unstable
if [ $? -gt 0 ]; then
echo "==> CVS export failed!"
+ cleanup
exit 1
fi
# check again
if [ -d /tmp/.gensync ]; then
echo "error: someone else is currently running gensync!"
+ cleanup
exit 1
fi
/usr/bin/gensync $TMPDIR/unstable $TMPDIR/unstable.db.tar.gz /home/ftp/unstable/os/i686