From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 12 Sep 2008 05:46:15 +0000 (-0400)
Subject: further lockfile debugging.
X-Git-Tag: monkeysphere_0.16-1~73
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=76f242f43c2d835d332ee9c449e2858ead571acb;p=monkeysphere.git

further lockfile debugging.
---

diff --git a/debian/changelog b/debian/changelog
index b034c88..fb0788e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ monkeysphere (0.16~pre-1) UNRELEASED; urgency=low
   [ Daniel Kahn Gillmor ]
   * replaced "#!/bin/bash" with "#!/usr/bin/env bash" for better
     portability.
+  * fixed busted lockfile arrangement, where empty file was being locked
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 11 Sep 2008 23:16:31 -0400
 
diff --git a/packaging/freebsd/Makefile b/packaging/freebsd/Makefile
index 2937d69..a03c108 100644
--- a/packaging/freebsd/Makefile
+++ b/packaging/freebsd/Makefile
@@ -21,6 +21,7 @@ COMMENT=       use the OpenPGP web of trust to verify ssh connections
 LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls
 RUN_DEPENDS=    base64:${PORTSDIR}/converters/base64 \
 		gpg:${PORTSDIR}/security/gnupg \
+		lockfile:${PORTSDIR}/mail/procmail \
 		bash:${PORTSDIR}/shells/bash
 
 MAN1=		monkeysphere.1 openpgp2ssh.1 monkeysphere-ssh-proxycommand.1
diff --git a/src/common b/src/common
index 25f7e4e..556dd5a 100644
--- a/src/common
+++ b/src/common
@@ -98,7 +98,7 @@ cutline() {
 lock() {
     local use_lockfileprogs=true
     local action="$1"
-    local file="$file"
+    local file="$2"
 
     if ! ( which lockfile-create >/dev/null 2>/dev/null ) ; then
 	if ! ( which lockfile >/dev/null ); then