torrent-config-charm

Merge ~barryprice/torrent-config-charm/+git/torrent-config-charm:trunk into torrent-config-charm:trunk

  1. Git
  2. lp:~barryprice/torrent-config-charm/+git/torrent-config-charm
  3. trunk
  4. Merge into trunk
Proposed by Barry Price
Status: Merged
Merged at revision: cf78b4d0dc32fe9012c1cafe7ce592a5194b17a9
Proposed branch: ~barryprice/torrent-config-charm/+git/torrent-config-charm:trunk
Merge into: torrent-config-charm:trunk
Diff against target: 19 lines (+1/-2)
1 file modified
files/torrent-sync (+1/-2)
Reviewer Review Type Date Requested Status
Paul Collins lgtm Approve
Review via email: mp+438518@code.launchpad.net

Commit message

Don't abort sync on local FQDN lookup failure

To post a comment you must log in.
Revision history for this message
Paul Collins (pjdc) :
review: Approve (lgtm)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/files/torrent-sync b/files/torrent-sync
index 721582e..e7c438e 100755
--- a/files/torrent-sync
+++ b/files/torrent-sync
@@ -19,13 +19,12 @@ umask 002
19. $HOME/torrent-sync.conf19. $HOME/torrent-sync.conf
20export RSYNC_PASSWORD20export RSYNC_PASSWORD
2121
22HOSTNAME=`hostname -f`
23LOGFILE=$HOME/logs/torrent-rsync.log22LOGFILE=$HOME/logs/torrent-rsync.log
24LOCK=$HOME/logs/torrent-rsync.lock23LOCK=$HOME/logs/torrent-rsync.lock
2524
26# Check to see if another sync is in progress25# Check to see if another sync is in progress
27if lockfile -! -l 43200 -r 0 "$LOCK"; then26if lockfile -! -l 43200 -r 0 "$LOCK"; then
28 echo $HOSTNAME is unable to start rsync, lock file exists27 echo Unable to start rsync, lock file exists
29 exit 128 exit 1
30fi29fi
31trap "rm -f $LOCK > /dev/null 2>&1" exit30trap "rm -f $LOCK > /dev/null 2>&1" exit

Subscribers

People subscribed via source and target branches