Merge lp:~jpds/ubumirror/debian-style-locking into lp:ubumirror

[Jonathan Davies]

[Nafallo Bjälevik (nafallo)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2009-04-11 20:57:29 +0000
+++ debian/control	2009-04-12 22:39:03 +0000
@@ -9,7 +9,7 @@
 
 Package: ubumirror
 Architecture: all
-Depends: cron, debianutils, jigit, procmail, rsync
+Depends: cron, debianutils, jigit, rsync
 Recommends: postfix | mail-transport-agent, apache2 | httpd
 Suggests: vsftpd | proftpd
 Description: Ubuntu mirror scripts

=== modified file 'ubuarchive'
--- ubuarchive	2009-04-12 20:41:51 +0000
+++ ubuarchive	2009-04-12 22:39:03 +0000
@@ -35,10 +35,16 @@
 umask 022
 
 # Check to see if another sync is in progress
-if lockfile -! -l 43200 -r 0 "$LOCK"; then
-  echo ${HOSTNAME} is unable to start rsync, lock file exists
-  exit 1
+if ! ( set -o noclobber; echo "$$" > "${LOCK}") 2> /dev/null; then
+        if ! $(kill -0 $(cat ${LOCK}) 2>/dev/null); then
+                # Process does either not exist or is not owned by us.
+                echo "$$" > "${LOCK}"
+        else
+                echo "Unable to start rsync, lock file still exists, PID $(cat ${LOCK})."
+                exit 1
+        fi
 fi
+
 trap 'rm -f $LOCK > /dev/null 2>&1; echo -n "Done at " >> $LOGDIR/ubuarchive.log; date >> $LOGDIR/ubuarchive.log; savelog -n $LOGDIR/ubuarchive.log > /dev/null' EXIT
 
 echo -n "Starting at " > $LOGDIR/ubuarchive.log

=== modified file 'ubucdimage'
--- ubucdimage	2009-04-12 20:41:51 +0000
+++ ubucdimage	2009-04-12 22:39:03 +0000
@@ -38,10 +38,16 @@
 umask 022
 
 # Check to see if another sync is in progress
-if lockfile -! -l 43200 -r 0 "$LOCK"; then
-  echo $HOSTNAME is unable to start rsync, lock file exists
-  exit 1
+if ! ( set -o noclobber; echo "$$" > "${LOCK}") 2> /dev/null; then
+        if ! $(kill -0 $(cat ${LOCK}) 2>/dev/null); then
+                # Process does either not exist or is not owned by us.
+                echo "$$" > "${LOCK}"
+        else
+                echo "Unable to start rsync, lock file still exists, PID $(cat ${LOCK})."
+                exit 1
+        fi
 fi
+
 trap 'rm -f $LOCK > /dev/null 2>&1; echo -n "Done at " >> $LOGDIR/ubucdimage.log; date >> $LOGDIR/ubucdimage.log; savelog -n $LOGDIR/ubucdimage.log > /dev/null' EXIT
 
 echo -n "Starting at " >> $LOGDIR/ubucdimage.log

=== modified file 'ubudvd'
--- ubudvd	2009-04-12 20:41:51 +0000
+++ ubudvd	2009-04-12 22:39:03 +0000
@@ -35,10 +35,16 @@
 umask 022
 
 # Check to see if another sync is in progress
-if lockfile -! -l 43200 -r 0 "$LOCK"; then
-  echo $HOSTNAME is unable to start rsync, lock file exists
-  exit 1
+if ! ( set -o noclobber; echo "$$" > "${LOCK}") 2> /dev/null; then
+        if ! $(kill -0 $(cat ${LOCK}) 2>/dev/null); then
+                # Process does either not exist or is not owned by us.
+                echo "$$" > "${LOCK}"
+        else
+                echo "Unable to start rsync, lock file still exists, PID $(cat ${LOCK})."
+                exit 1
+        fi
 fi
+
 trap 'rm -f $LOCK > /dev/null 2>&1; echo -n "Done at " >> $LOGDIR/ubudvd.log; date >> $LOGDIR/ubudvd.log; savelog -n $LOGDIR/ubudvd.log > /dev/null' EXIT
 
 echo -n "Starting at " >> $LOGDIR/ubudvd.log

=== modified file 'uburelease'
--- uburelease	2009-04-12 20:41:51 +0000
+++ uburelease	2009-04-12 22:39:03 +0000
@@ -35,10 +35,16 @@
 umask 022
 
 # Check to see if another sync is in progress
-if lockfile -! -l 43200 -r 0 "$LOCK"; then
-  echo $HOSTNAME is unable to start rsync, lock file exists
-  exit 1
+if ! ( set -o noclobber; echo "$$" > "${LOCK}") 2> /dev/null; then
+        if ! $(kill -0 $(cat ${LOCK}) 2>/dev/null); then
+                # Process does either not exist or is not owned by us.
+                echo "$$" > "${LOCK}"
+        else
+                echo "Unable to start rsync, lock file still exists, PID $(cat ${LOCK})."
+                exit 1
+        fi
 fi
+
 trap 'rm -f $LOCK > /dev/null 2>&1; echo -n "Done at " >> $LOGDIR/uburelease.log; date >> $LOGDIR/uburelease.log; savelog -n $LOGDIR/uburelease.log > /dev/null' EXIT
 
 echo -n "Starting at " >> $LOGDIR/uburelease.log