From ad520b527f3c5d2471e4b471eca5439643a01939 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 11 Apr 2010 13:52:32 +0200
Subject: Fail if lock couldn't be obtained; Unlock the repos if ftpdir-cleanup
 fails

---
 misc-scripts/ftpdir-cleanup | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'misc-scripts')

diff --git a/misc-scripts/ftpdir-cleanup b/misc-scripts/ftpdir-cleanup
index 4c559b9..d5f5737 100755
--- a/misc-scripts/ftpdir-cleanup
+++ b/misc-scripts/ftpdir-cleanup
@@ -13,13 +13,24 @@ dest=$2
 . "$(dirname $0)/../db-functions"
 . "$(dirname $0)/../config"
 
+cleanup() {
+  trap '' 2 15
+  for arch in ${ARCHES[@]}; do
+    repo_unlock $reponame $arch
+  done
+  exit 1
+}
+
+trap cleanup 2
+trap cleanup 15
+
 ${CLEANUP_DRYRUN} && echo 'dry run mode is active'
 
 ftppath_base="$FTP_BASE/$reponame/$FTP_OS_SUFFIX"
 
 for arch in ${ARCHES[@]}; do
 
-  repo_lock $reponame $arch $LOCK_TIMEOUT
+  repo_lock $reponame $arch $LOCK_TIMEOUT || continue
 
   TMPDIR=$(mktemp -d /tmp/cleanup-XXXXXX) || exit 1
   ftppath="$ftppath_base/$arch"
-- 
cgit v1.2.3-24-g4f1b